[pull] master from chromium:master

DEPS

@@ -190,7 +190,7 @@ vars = {
   # luci-go CIPD package version.
   # Make sure the revision is uploaded by infra-packagers builder.
   # https://ci.chromium.org/p/infra-internal/g/infra-packagers/console
-  'luci_go': 'git_revision:d10ff2af1182ccaad573bc5acb84a36f4c280876',
+  'luci_go': 'git_revision:b36efc79b549f8aeb29ce40079891e1acb6c6bb2',
 
   # This can be overridden, e.g. with custom_vars, to build clang from HEAD
   # instead of downloading the prebuilt pinned revision.
@@ -222,19 +222,19 @@ vars = {
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling Skia
   # and whatever else without interference from each other.
-  'skia_revision': 'f02aa80ba91b1741c52909cd8b84c5c9880a8e38',
+  'skia_revision': '230a2514d6998866afacb5f3aa796e28447ed25c',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling V8
   # and whatever else without interference from each other.
-  'v8_revision': '7744dce208a555494e4a33e24fadc71ea20b3895',
+  'v8_revision': '10df900d12a671fb7a17514c0b62203df2ebaf2b',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling swarming_client
   # and whatever else without interference from each other.
   'swarming_revision': 'a32a1607f6093d338f756c7e7c7b4333b0c50c9c',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling ANGLE
   # and whatever else without interference from each other.
-  'angle_revision': '32829f093e413f2df5ab0a4672a0a071fa546926',
+  'angle_revision': '5fb3a549f6a976c03cf7f94a7114d06d8e2c35d9',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling SwiftShader
   # and whatever else without interference from each other.
@@ -269,7 +269,7 @@ vars = {
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling NaCl
   # and whatever else without interference from each other.
-  'nacl_revision': '96c11240b652b05d2708e73c9ce837dfea2208cc',
+  'nacl_revision': '99d0376791a10d3e8d16d0884b0222853567d7cc',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling freetype
   # and whatever else without interference from each other.
@@ -301,7 +301,7 @@ vars = {
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling devtools-frontend
   # and whatever else without interference from each other.
-  'devtools_frontend_revision': '34b35e4725a0f34f178ca82f6ca6bc63e409536d',
+  'devtools_frontend_revision': '37d4b4fedb41317e702f272ddb4b0f97f1718d94',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling libprotobuf-mutator
   # and whatever else without interference from each other.
@@ -581,7 +581,7 @@ deps = {
   },
 
   'src/ios/third_party/material_components_ios/src': {
-      'url': Var('chromium_git') + '/external/github.com/material-components/material-components-ios.git' + '@' + '57b98fffd5567c587cc24639b8582a8995e5575a',
+      'url': Var('chromium_git') + '/external/github.com/material-components/material-components-ios.git' + '@' + '1afa18ee17b71d17e9e23bf0584be0600c975667',
       'condition': 'checkout_ios',
   },
 
@@ -738,7 +738,7 @@ deps = {
     'packages': [
       {
           'package': 'chromium/third_party/androidx',
-          'version': 'xXfTzt6__4_ooeFJUwsWc8CiehiWLlYQ-pX4VxOyAEoC',
+          'version': 'S6dCY92KZR4uySXoIPzDOReE8nJYQNPXboKDPsSdhpYC',
       },
     ],
     'condition': 'checkout_android',
@@ -1619,7 +1619,7 @@ deps = {
       'packages': [
         {
           'package': 'skia/tools/goldctl/linux-amd64',
-          'version': 'v3HXOS7MJkC2TfycHGZS1dHlQ_BosbzqLeuDXXLbxMUC',
+          'version': 'up6EUcZzuFZnm2JCEV1eW0TwCEAZjPcqtS2CsZN-3qAC',
         },
       ],
       'dep_type': 'cipd',
@@ -1629,7 +1629,7 @@ deps = {
       'packages': [
         {
           'package': 'skia/tools/goldctl/windows-amd64',
-          'version': '5vRobMZ1N26UvonRAdJZ66IEfzd3vF8r6z8j4Nqrhc8C',
+          'version': 'pLY1rCmGsL8vtV0wWxgqY3sOWkwIxuRh6PMIn_0BDcAC',
         },
       ],
       'dep_type': 'cipd',
@@ -1639,7 +1639,7 @@ deps = {
       'packages': [
         {
           'package': 'skia/tools/goldctl/mac-amd64',
-          'version': 'nx0V9Budj8K1DfPIdKA9oakeQE7SPTMIvVwqzX0DkF4C',
+          'version': 'eR_S1Urlw9be4WKiQcXwEcBn9KiDrWknodT82I6vw-kC',
         },
       ],
       'dep_type': 'cipd',
@@ -1653,7 +1653,7 @@ deps = {
     Var('chromium_git') + '/v8/v8.git' + '@' +  Var('v8_revision'),
 
   'src-internal': {
-    'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git@848ab13a5930d7fe2440193d41ff193e707ccfc8',
+    'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git@bdc84d211a2b7a85a7b08ebfe4fcd67688e25571',
     'condition': 'checkout_src_internal',
   },
 

ash/BUILD.gn

@@ -50,8 +50,12 @@ component("ash") {
     "accelerometer/accelerometer_constants.h",
     "accelerometer/accelerometer_file_reader.cc",
     "accelerometer/accelerometer_file_reader.h",
+    "accelerometer/accelerometer_provider_mojo.cc",
+    "accelerometer/accelerometer_provider_mojo.h",
     "accelerometer/accelerometer_reader.cc",
     "accelerometer/accelerometer_reader.h",
+    "accelerometer/accelerometer_samples_observer.cc",
+    "accelerometer/accelerometer_samples_observer.h",
     "accelerometer/accelerometer_types.cc",
     "accelerometer/accelerometer_types.h",
     "accessibility/accessibility_controller_impl.cc",
@@ -1868,6 +1872,8 @@ component("ash") {
     "//chromeos/components/quick_answers",
     "//chromeos/components/quick_answers/public/cpp:prefs",
     "//chromeos/components/sensors:buildflags",
+    "//chromeos/components/sensors:sensors",
+    "//chromeos/components/sensors/mojom",
     "//chromeos/crosapi/cpp",
     "//chromeos/dbus",
     "//chromeos/dbus/audio",
@@ -2007,23 +2013,6 @@ component("ash") {
 
     deps += [ "//chromeos/assistant/internal/ambient" ]
   }
-
-  if (use_iioservice) {
-    sources -= [
-      "accelerometer/accelerometer_file_reader.cc",
-      "accelerometer/accelerometer_file_reader.h",
-    ]
-    sources += [
-      "accelerometer/accelerometer_provider_mojo.cc",
-      "accelerometer/accelerometer_provider_mojo.h",
-      "accelerometer/accelerometer_samples_observer.cc",
-      "accelerometer/accelerometer_samples_observer.h",
-    ]
-    deps += [
-      "//chromeos/components/sensors:sensors",
-      "//chromeos/components/sensors/mojom",
-    ]
-  }
 }
 
 action("dbus_service_files") {
@@ -2054,6 +2043,8 @@ test("ash_unittests") {
     "accelerators/accelerator_unittest.cc",
     "accelerators/magnifier_key_scroller_unittest.cc",
     "accelerators/spoken_feedback_toggler_unittest.cc",
+    "accelerometer/accelerometer_provider_mojo_unittest.cc",
+    "accelerometer/accelerometer_samples_observer_unittest.cc",
     "accessibility/accessibility_controller_unittest.cc",
     "accessibility/autoclick/autoclick_drag_event_rewriter_unittest.cc",
     "accessibility/autoclick/autoclick_unittest.cc",
@@ -2516,6 +2507,9 @@ test("ash_unittests") {
     "//chromeos/components/feature_usage",
     "//chromeos/components/phonehub:test_support",
     "//chromeos/components/quick_answers:quick_answers",
+    "//chromeos/components/sensors:sensors",
+    "//chromeos/components/sensors:test_support",
+    "//chromeos/components/sensors/mojom",
     "//chromeos/dbus:test_support",
     "//chromeos/dbus/audio",
     "//chromeos/dbus/hammerd",
@@ -2633,18 +2627,6 @@ test("ash_unittests") {
     "//content/public/browser",
     "//content/public/common",
   ]
-
-  if (use_iioservice) {
-    sources += [
-      "accelerometer/accelerometer_provider_mojo_unittest.cc",
-      "accelerometer/accelerometer_samples_observer_unittest.cc",
-    ]
-    deps += [
-      "//chromeos/components/sensors:sensors",
-      "//chromeos/components/sensors:test_support",
-      "//chromeos/components/sensors/mojom",
-    ]
-  }
 }
 
 # TODO(oshima): Remove or migrate to new ash_ui_perftests

ash/components/account_manager/account_manager_factory.cc

@@ -9,7 +9,7 @@
 
 #include "base/macros.h"
 #include "components/account_manager_core/chromeos/account_manager.h"
-#include "components/account_manager_core/chromeos/account_manager_ash.h"
+#include "components/account_manager_core/chromeos/account_manager_mojo_service.h"
 
 namespace ash {
 
@@ -23,18 +23,21 @@ account_manager::AccountManager* AccountManagerFactory::GetAccountManager(
   return GetAccountManagerHolder(profile_path).account_manager.get();
 }
 
-crosapi::AccountManagerAsh* AccountManagerFactory::GetAccountManagerAsh(
+crosapi::AccountManagerMojoService*
+AccountManagerFactory::GetAccountManagerMojoService(
     const std::string& profile_path) {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
 
-  return GetAccountManagerHolder(profile_path).account_manager_ash.get();
+  return GetAccountManagerHolder(profile_path)
+      .account_manager_mojo_service.get();
 }
 
 AccountManagerFactory::AccountManagerHolder::AccountManagerHolder(
     std::unique_ptr<account_manager::AccountManager> account_manager,
-    std::unique_ptr<crosapi::AccountManagerAsh> account_manager_ash)
+    std::unique_ptr<crosapi::AccountManagerMojoService>
+        account_manager_mojo_service)
     : account_manager(std::move(account_manager)),
-      account_manager_ash(std::move(account_manager_ash)) {}
+      account_manager_mojo_service(std::move(account_manager_mojo_service)) {}
 
 AccountManagerFactory::AccountManagerHolder::~AccountManagerHolder() = default;
 
@@ -44,13 +47,14 @@ AccountManagerFactory::GetAccountManagerHolder(
   auto it = account_managers_.find(profile_path);
   if (it == account_managers_.end()) {
     auto account_manager = std::make_unique<account_manager::AccountManager>();
-    auto account_manager_ash =
-        std::make_unique<crosapi::AccountManagerAsh>(account_manager.get());
+    auto account_manager_mojo_service =
+        std::make_unique<crosapi::AccountManagerMojoService>(
+            account_manager.get());
     it = account_managers_
-             .emplace(std::piecewise_construct,
-                      std::forward_as_tuple(profile_path),
-                      std::forward_as_tuple(std::move(account_manager),
-                                            std::move(account_manager_ash)))
+             .emplace(
+                 std::piecewise_construct, std::forward_as_tuple(profile_path),
+                 std::forward_as_tuple(std::move(account_manager),
+                                       std::move(account_manager_mojo_service)))
              .first;
   }
   return it->second;

ash/components/account_manager/account_manager_factory.h

@@ -17,7 +17,7 @@ class AccountManager;
 }  // namespace account_manager
 
 namespace crosapi {
-class AccountManagerAsh;
+class AccountManagerMojoService;
 }  // namespace crosapi
 
 namespace ash {
@@ -42,28 +42,31 @@ class COMPONENT_EXPORT(ASH_COMPONENTS_ACCOUNT_MANAGER) AccountManagerFactory {
   account_manager::AccountManager* GetAccountManager(
       const std::string& profile_path);
 
-  // Returns the |AccountManagerAsh| corresponding to the given |profile_path|.
-  crosapi::AccountManagerAsh* GetAccountManagerAsh(
+  // Returns the |AccountManagerMojoService| corresponding to the given
+  // |profile_path|.
+  crosapi::AccountManagerMojoService* GetAccountManagerMojoService(
       const std::string& profile_path);
 
  private:
   struct AccountManagerHolder {
     AccountManagerHolder(
         std::unique_ptr<account_manager::AccountManager> account_manager,
-        std::unique_ptr<crosapi::AccountManagerAsh> account_manager_ash);
+        std::unique_ptr<crosapi::AccountManagerMojoService>
+            account_manager_mojo_service);
     AccountManagerHolder(const AccountManagerHolder&) = delete;
     AccountManagerHolder& operator=(const AccountManagerHolder&) = delete;
     ~AccountManagerHolder();
 
     const std::unique_ptr<account_manager::AccountManager> account_manager;
-    const std::unique_ptr<crosapi::AccountManagerAsh> account_manager_ash;
+    const std::unique_ptr<crosapi::AccountManagerMojoService>
+        account_manager_mojo_service;
   };
 
   const AccountManagerHolder& GetAccountManagerHolder(
       const std::string& profile_path);
 
   // A mapping from Profile path to an |AccountManagerHolder|. Acts a cache of
-  // Account Managers and AccountManagerAsh objects.
+  // Account Managers and AccountManagerMojoService objects.
   std::unordered_map<std::string, AccountManagerHolder> account_managers_;
 
   SEQUENCE_CHECKER(sequence_checker_);

ash/constants/ash_features.cc

@@ -482,7 +482,7 @@ const base::Feature kFastPair{"FastPair", base::FEATURE_DISABLED_BY_DEFAULT};
 // Enables mounting various archive formats in Files App.
 // https://crbug.com/1216245
 const base::Feature kFilesArchivemount{"FilesArchivemount",
-                                       base::FEATURE_DISABLED_BY_DEFAULT};
+                                       base::FEATURE_ENABLED_BY_DEFAULT};
 
 // Enable the updated banner framework.
 // https://crbug.com/1228128
@@ -1096,6 +1096,11 @@ const base::Feature kVirtualKeyboardBorderedKey{
 const base::Feature kVirtualKeyboardMultipaste{
     "VirtualKeyboardMultipaste", base::FEATURE_ENABLED_BY_DEFAULT};
 
+// Enable or disable showing multipaste suggestions in virtual keyboard on
+// Chrome OS.
+const base::Feature kVirtualKeyboardMultipasteSuggestion{
+    "VirtualKeyboardMultipasteSuggestion", base::FEATURE_DISABLED_BY_DEFAULT};
+
 // Enable or disable the chrome://vm page
 const base::Feature kVmStatusPage{"VmStatusPage",
                                   base::FEATURE_ENABLED_BY_DEFAULT};

ash/constants/ash_features.h

@@ -378,6 +378,9 @@ COMPONENT_EXPORT(ASH_CONSTANTS)
 extern const base::Feature kSmartLockUIRevamp;
 COMPONENT_EXPORT(ASH_CONSTANTS) extern const base::Feature kSplitSettingsSync;
 COMPONENT_EXPORT(ASH_CONSTANTS) extern const base::Feature kStylusBatteryStatus;
+COMPONENT_EXPORT(ASH_CONSTANTS) extern const base::Feature kSyncConsentOptional;
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const base::Feature kSyncSettingsCategorization;
 COMPONENT_EXPORT(ASH_CONSTANTS)
 extern const base::Feature kSystemLatinPhysicalTyping;
 COMPONENT_EXPORT(ASH_CONSTANTS)
@@ -409,6 +412,8 @@ COMPONENT_EXPORT(ASH_CONSTANTS)
 extern const base::Feature kVirtualKeyboardBorderedKey;
 COMPONENT_EXPORT(ASH_CONSTANTS)
 extern const base::Feature kVirtualKeyboardMultipaste;
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const base::Feature kVirtualKeyboardMultipasteSuggestion;
 COMPONENT_EXPORT(ASH_CONSTANTS) extern const base::Feature kVmStatusPage;
 COMPONENT_EXPORT(ASH_CONSTANTS) extern const base::Feature kWakeOnWifiAllowed;
 COMPONENT_EXPORT(ASH_CONSTANTS) extern const base::Feature kWallpaperWebUI;

ash/shortcut_viewer/strings/shortcut_viewer_strings_ar.xtb

@@ -126,6 +126,7 @@
 <translation id="526651782186312376">تحديد النص حتى بداية السطر</translation>
 <translation id="5316716239522500219">نسخ الشاشات</translation>
 <translation id="539072479502328326">تفعيل وضع "المكبّر الذي تم إرساؤه" أو إيقافه</translation>
+<translation id="5466615362193675484">تبديل القائمة لتفعيل وضع قفل ميزة تغيير الحجم</translation>
 <translation id="5541719484267030947">أثناء سحب علامة التبويب، اضغط على <ph name="ESC" /></translation>
 <translation id="5554139136362089836">البحث في الصفحة الحالية</translation>
 <translation id="5563050856984839829">اضغط على <ph name="CTRL" /><ph name="SEPARATOR" /><ph name="SHIFT" /> وانقر على رابط</translation>

ash/shortcut_viewer/strings/shortcut_viewer_strings_as.xtb

@@ -126,6 +126,7 @@
 <translation id="526651782186312376">শাৰীটোৰ আৰম্ভণিৰ ফালৰ পাঠ বাছনি কৰক</translation>
 <translation id="5316716239522500219">আইনা মনিটৰ</translation>
 <translation id="539072479502328326">ড'ক কৰা বিৱৰ্ধক অন বা অফ কৰক</translation>
+<translation id="5466615362193675484">লক ম’ডৰ আকাৰ সলনি কৰাৰ মেনু ট’গল কৰক</translation>
 <translation id="5541719484267030947">টেবটো টানি আনোতে, <ph name="ESC" /> টিপক</translation>
 <translation id="5554139136362089836">বৰ্তমানৰ পৃষ্ঠাটো সন্ধান কৰক</translation>
 <translation id="5563050856984839829"><ph name="CTRL" /><ph name="SEPARATOR" /><ph name="SHIFT" /> টিপক আৰু এটা লিংকত ক্লিক কৰক</translation>

ash/shortcut_viewer/strings/shortcut_viewer_strings_id.xtb

@@ -126,7 +126,7 @@
 <translation id="526651782186312376">Memilih teks ke awal baris</translation>
 <translation id="5316716239522500219">Cerminkan monitor</translation>
 <translation id="539072479502328326">Mengaktifkan atau menonaktifkan kaca pembesar tersemat</translation>
-<translation id="5466615362193675484">Beralih menu untuk mengubah ukuran mode kunci</translation>
+<translation id="5466615362193675484">Menampilkan/menyembunyikan menu mode kunci pengubahan ukuran</translation>
 <translation id="5541719484267030947">Saat menyeret tab, tekan <ph name="ESC" /></translation>
 <translation id="5554139136362089836">Menelusuri halaman aktif</translation>
 <translation id="5563050856984839829">Tekan <ph name="CTRL" /><ph name="SEPARATOR" /><ph name="SHIFT" />, lalu klik link</translation>

ash/shortcut_viewer/strings/shortcut_viewer_strings_tr.xtb

@@ -126,6 +126,7 @@
 <translation id="526651782186312376">Metni satırın başına kadar seçer</translation>
 <translation id="5316716239522500219">Monitörleri yansıt</translation>
 <translation id="539072479502328326">Yerleştirilmiş büyüteç işlevini açar veya kapatır.</translation>
+<translation id="5466615362193675484">Kilit modunu yeniden boyutlandırma menüsünü açıp kapatır</translation>
 <translation id="5541719484267030947">Sekmeyi sürüklerken <ph name="ESC" /> tuşuna basın</translation>
 <translation id="5554139136362089836">Geçerli sayfada arama yapar</translation>
 <translation id="5563050856984839829"><ph name="CTRL" /><ph name="SEPARATOR" /><ph name="SHIFT" /> tuşlarına basın ve bir bağlantıyı tıklayın</translation>

ash/shortcut_viewer/strings/shortcut_viewer_strings_zh-TW.xtb

@@ -127,6 +127,7 @@
 <translation id="526651782186312376">選取文字至本行開頭</translation>
 <translation id="5316716239522500219">顯示器鏡像</translation>
 <translation id="539072479502328326">開啟或關閉停駐放大鏡</translation>
+<translation id="5466615362193675484">切換選單即可查看調整鎖定尺寸模式</translation>
 <translation id="5541719484267030947">在拖曳分頁時按下 <ph name="ESC" /> 鍵</translation>
 <translation id="5554139136362089836">搜尋目前網頁</translation>
 <translation id="5563050856984839829">按住 <ph name="CTRL" /><ph name="SEPARATOR" /><ph name="SHIFT" /> 鍵，然後按一下連結</translation>

ash/strings/ash_strings_ar.xtb

@@ -16,6 +16,7 @@
 <translation id="1056775291175587022">ما من شبكات</translation>
 <translation id="1059194134494239015"><ph name="DISPLAY_NAME" />: <ph name="RESOLUTION" /></translation>
 <translation id="1073899992769346247">استبدِل البطارية أو أعِد شحنها.</translation>
+<translation id="1077253978657569125">نريد تحسين هذه الميزة.</translation>
 <translation id="108486256082349153">خلوي: <ph name="ADDRESS" /></translation>
 <translation id="1087110696012418426">مساء الخير <ph name="GIVEN_NAME" />،</translation>
 <translation id="109942774857561566">أشعر بالملل</translation>
@@ -1032,6 +1033,7 @@
 <translation id="9080132581049224423">يُرجى التمرير السريع إلى الأعلى للانتقال إلى الصفحة الرئيسية.</translation>
 <translation id="9080206825613744995">الميكروفون قيد الاستخدام</translation>
 <translation id="9084606467167974638">تبديل موضع القائمة</translation>
+<translation id="9087578468327036362">الإبلاغ عن هذا الطلب</translation>
 <translation id="9089416786594320554">أساليب الإدخال</translation>
 <translation id="9091626656156419976">تمت إزالة عرض <ph name="DISPLAY_NAME" /></translation>
 <translation id="9098969848082897657">كتم صوت الهاتف</translation>