[pull] main from chromium:main

DEPS

@@ -249,11 +249,11 @@ vars = {
   # 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': 'ceb9223e1ab1df795d5f3e69f9fae92bb8328e92',
+  'v8_revision': 'f5e412a1cd82fb606b79a587f1c4bda7f9445701',
   # 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': 'e7413adff5a3f91d34bbf3f2bb0b3be848091cd7',
+  'angle_revision': '543f5750f70e014dc9c2217fb2fcf1c6b63badd5',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling SwiftShader
   # and whatever else without interference from each other.
@@ -312,7 +312,7 @@ vars = {
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling catapult
   # and whatever else without interference from each other.
-  'catapult_revision': '1a164a8ef025f3f2c0735e936f802a352956b627',
+  'catapult_revision': '2c2d76537b02cca4c0df364f14ee6e9b28afaf8b',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling libFuzzer
   # and whatever else without interference from each other.
@@ -360,7 +360,7 @@ vars = {
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling feed
   # and whatever else without interference from each other.
-  'dawn_revision': 'a2241d402e05dac272c0b3b7d26fd8a2cbd90ae7',
+  'dawn_revision': '3649af2486cd1c805f364a54cdf127179330024a',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling feed
   # and whatever else without interference from each other.
@@ -427,7 +427,7 @@ vars = {
   'libcxx_revision':       '79a2e924d96e2fc1e4b937c42efd08898fa472d7',
 
   # GN CIPD package version.
-  'gn_version': 'git_revision:2e56c317bd8e2bf152cfa2ead6ac5fa476fe28b4',
+  'gn_version': 'git_revision:18df6af86191edab1e47c84d56e608da414d446b',
 }
 
 # Only these hosts are allowed for dependencies in this DEPS file.
@@ -1024,7 +1024,7 @@ deps = {
   # Tools used when building Chrome for Chrome OS. This affects both the Simple
   # Chrome workflow, as well as the chromeos-chrome ebuild.
   'src/third_party/chromite': {
-      'url': Var('chromium_git') + '/chromiumos/chromite.git' + '@' + '1cad40c1e7201ae3c1273066c335771590bdce2b',
+      'url': Var('chromium_git') + '/chromiumos/chromite.git' + '@' + '3fc099b1f0bbdcdc4a0785b50b38a8267a000263',
       'condition': 'checkout_chromeos',
   },
 
@@ -1081,7 +1081,7 @@ deps = {
     Var('chromium_git') + '/chromium/deps/flac.git' + '@' + 'af862024c8c8fa0ae07ced05e89013d881b00596',
 
   'src/third_party/flatbuffers/src':
-    Var('chromium_git') + '/external/github.com/google/flatbuffers.git' + '@' + '4f7f6dc301f5ffb9765b055d48324dc7629abd5a',
+    Var('chromium_git') + '/external/github.com/google/flatbuffers.git' + '@' + 'b8aaccee8248059b2af032cca0eb1d2ddbdb6cdc',
 
   # Used for embedded builds. CrOS & Linux use the system version.
   'src/third_party/fontconfig/src': {
@@ -1648,7 +1648,7 @@ deps = {
     Var('chromium_git') + '/external/github.com/gpuweb/cts.git' + '@' + 'c843f8d63c8c17acfbb7d48e09059a581ba779b9',
 
   'src/third_party/webrtc':
-    Var('webrtc_git') + '/src.git' + '@' + '9754a43403e0b955546aff0e7d07d6f70def4043',
+    Var('webrtc_git') + '/src.git' + '@' + '03cb7e5a6124d7475bba4da6e5f093f1c0306c9e',
 
   'src/third_party/libgifcodec':
      Var('skia_git') + '/libgifcodec' + '@'+  Var('libgifcodec_revision'),
@@ -1691,6 +1691,8 @@ deps = {
       'dep_type': 'cipd',
       'condition': 'checkout_win',
   },
+  # TODO(crbug.com/1280002): Remove this entry once the autoroller has been
+  # updated to roll the mac_amd64 version.
   'src/tools/skia_goldctl/mac': {
       'packages': [
         {
@@ -1702,6 +1704,28 @@ deps = {
       'condition': 'checkout_mac',
   },
 
+  'src/tools/skia_goldctl/mac_amd64': {
+      'packages': [
+        {
+          'package': 'skia/tools/goldctl/mac-amd64',
+          'version': 'zLP4FDegN-yg3uvzWUdf4zNRVHDwHd0VLm86FkZCP_MC',
+        },
+      ],
+      'dep_type': 'cipd',
+      'condition': 'checkout_mac',
+  },
+
+  'src/tools/skia_goldctl/mac_arm64': {
+      'packages': [
+        {
+          'package': 'skia/tools/goldctl/mac-arm64',
+          'version': 'FOo-HR3_OFTL0pn9TIm0H93TmtXgEfjSazYb3xAtx68C',
+        },
+      ],
+      'dep_type': 'cipd',
+      'condition': 'checkout_mac',
+  },
+
   'src/v8':
     Var('chromium_git') + '/v8/v8.git' + '@' +  Var('v8_revision'),
 
@@ -1725,7 +1749,7 @@ deps = {
     'packages': [
       {
         'package': 'chromeos_internal/apps/help_app/app',
-        'version': '27KUeowb-avScJevs9PyckybR1s34lIOg_CMEaolREQC',
+        'version': '5GaoHsS9Sb6U1WEQwNSowrgNf8r6rvc0he_rf8kNgSQC',
       },
     ],
     'condition': 'checkout_chromeos and checkout_src_internal',
@@ -3396,7 +3420,7 @@ deps = {
       'packages': [
           {
               'package': 'chromium/third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_stdlib',
-              'version': 'version:2@1.6.0.cr0',
+              'version': 'version:2@1.6.10.cr0',
           },
       ],
       'condition': 'checkout_android',
@@ -3407,7 +3431,7 @@ deps = {
       'packages': [
           {
               'package': 'chromium/third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_stdlib_common',
-              'version': 'version:2@1.6.0.cr0',
+              'version': 'version:2@1.6.10.cr0',
           },
       ],
       'condition': 'checkout_android',

android_webview/browser/gfx/overlay_processor_webview.cc

@@ -667,7 +667,7 @@ OverlayProcessorWebView::TakeSurfaceTransactionOnRT() {
   return manager_->TakeHWUITransaction();
 }
 
-void OverlayProcessorWebView::CheckOverlaySupport(
+void OverlayProcessorWebView::CheckOverlaySupportImpl(
     const viz::OverlayProcessorInterface::OutputSurfaceOverlayPlane*
         primary_plane,
     viz::OverlayCandidateList* candidates) {

android_webview/browser/gfx/overlay_processor_webview.h

@@ -59,7 +59,7 @@ class OverlayProcessorWebView : public viz::OverlayProcessorSurfaceControl,
       viz::DisplayResourceProvider* resource_provider) override;
   void AdjustOutputSurfaceOverlay(absl::optional<OutputSurfaceOverlayPlane>*
                                       output_surface_plane) override {}
-  void CheckOverlaySupport(
+  void CheckOverlaySupportImpl(
       const viz::OverlayProcessorInterface::OutputSurfaceOverlayPlane*
           primary_plane,
       viz::OverlayCandidateList* candidates) override;

android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumAwInit.java

@@ -7,6 +7,7 @@
 import android.Manifest;
 import android.content.Context;
 import android.content.pm.PackageManager;
+import android.content.res.Resources;
 import android.os.Build;
 import android.os.Looper;
 import android.os.Process;
@@ -54,6 +55,7 @@
 import org.chromium.build.BuildConfig;
 import org.chromium.content_public.browser.UiThreadTaskTraits;
 import org.chromium.net.NetworkChangeNotifier;
+import org.chromium.ui.base.DeviceFormFactor;
 import org.chromium.ui.base.ResourceBundle;
 
 /**
@@ -194,6 +196,28 @@ protected void startChromiumLocked() {
 
             // NOTE: Finished writing Java resources. From this point on, it's safe to use them.
 
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S && mIsPostedFromBackgroundThread) {
+                // Try to work around the problem we're seeing with resources on Android 12. When
+                // WebView is being initialized from a background thread, it's possible that the
+                // asset path updated by WebViewFactory is no longer present by the time we get
+                // here due to something on the UI thread having caused a resource update in the
+                // app in the meantime, because WebViewFactory does not add the path persistently.
+                // So, we can try to add them again using the "better" method in WebViewDelegate.
+
+                // However, we only want to try this if the resources are actually missing, because
+                // in the past we've seen this cause apps that were working to *start* crashing.
+                // The first resource that gets accessed in startup happens during the
+                // AwBrowserProcess.start() call when trying to determine if the device is a tablet,
+                // and that's the most common place for us to crash. So, try calling that same
+                // method and see if it throws - if so then we're unlikely to make the situation
+                // any worse by trying to fix the path.
+                try {
+                    DeviceFormFactor.isTablet();
+                } catch (Resources.NotFoundException e) {
+                    mFactory.addWebViewAssetPath(context);
+                }
+            }
+
             AwBrowserProcess.configureChildProcessLauncher();
 
             // finishVariationsInitLocked() must precede native initialization so the seed is

ash/BUILD.gn

@@ -541,6 +541,8 @@ component("ash") {
     "ime/mode_indicator_observer.h",
     "in_session_auth/auth_dialog_contents_view.cc",
     "in_session_auth/auth_dialog_contents_view.h",
+    "in_session_auth/authentication_dialog.cc",
+    "in_session_auth/authentication_dialog.h",
     "in_session_auth/in_session_auth_dialog.cc",
     "in_session_auth/in_session_auth_dialog.h",
     "in_session_auth/in_session_auth_dialog_controller_impl.cc",
@@ -2354,6 +2356,7 @@ test("ash_unittests") {
     "highlighter/highlighter_gesture_util_unittest.cc",
     "host/ash_window_tree_host_platform_unittest.cc",
     "ime/ime_controller_impl_unittest.cc",
+    "in_session_auth/authentication_dialog_unittest.cc",
     "in_session_auth/in_session_auth_dialog_controller_impl_unittest.cc",
     "in_session_auth/mock_in_session_auth_dialog_client.cc",
     "in_session_auth/mock_in_session_auth_dialog_client.h",

ash/app_list/views/apps_grid_context_menu.cc

@@ -31,10 +31,6 @@ void AppsGridContextMenu::ExecuteCommand(int command_id, int event_flags) {
       AppListModelProvider::Get()->model()->delegate()->RequestAppListSort(
           AppListSortOrder::kNameAlphabetical);
       break;
-    case AppsGridCommandId::kReorderByNameReverseAlphabetical:
-      AppListModelProvider::Get()->model()->delegate()->RequestAppListSort(
-          AppListSortOrder::kNameReverseAlphabetical);
-      break;
     case AppsGridCommandId::kReorderByColor:
       AppListModelProvider::Get()->model()->delegate()->RequestAppListSort(
           AppListSortOrder::kColor);
@@ -71,31 +67,23 @@ void AppsGridContextMenu::ShowContextMenuForViewImpl(
 
 void AppsGridContextMenu::BuildMenuModel() {
   context_menu_model_ = std::make_unique<ui::SimpleMenuModel>(this);
-  reorder_name_submenu_ = std::make_unique<ui::SimpleMenuModel>(this);
-
-  // As both of the submenu items are not planned to be launched, the option
-  // strings are directly written as the parameters.
-  // TODO(https://crbug.com/1269386): Add i18n strings for each menu item.
-  reorder_name_submenu_->AddItem(kReorderByNameAlphabetical, u"Alphabetical");
-  reorder_name_submenu_->AddItem(kReorderByNameReverseAlphabetical,
-                                 u"Reverse alphabetical");
 
   context_menu_model_->AddTitle(l10n_util::GetStringUTF16(
       IDS_ASH_LAUNCHER_APPS_GRID_CONTEXT_MENU_REORDER_TITLE));
-  context_menu_model_->AddSubMenuWithIcon(
-      AppsGridCommandId::kReorderByName,
+  context_menu_model_->AddItemWithIcon(
+      AppsGridCommandId::kReorderByNameAlphabetical,
       l10n_util::GetStringUTF16(
           IDS_ASH_LAUNCHER_APPS_GRID_CONTEXT_MENU_REORDER_BY_NAME),
-      reorder_name_submenu_.get(),
       ui::ImageModel::FromVectorIcon(kSortAlphabeticalIcon));
-  // TODO(crbug.com/1276230): Add vector icon to reorder by color option.
-  // TODO(https://crbug.com/1269386): Add i18n strings for color menu item.
-  context_menu_model_->AddItem(kReorderByColor, u"Color");
+  context_menu_model_->AddItemWithIcon(
+      AppsGridCommandId::kReorderByColor,
+      l10n_util::GetStringUTF16(
+          IDS_ASH_LAUNCHER_APPS_GRID_CONTEXT_MENU_REORDER_BY_COLOR),
+      ui::ImageModel::FromVectorIcon(kSortColorIcon));
 }
 
 void AppsGridContextMenu::OnMenuClosed() {
   menu_runner_.reset();
-  reorder_name_submenu_.reset();
   context_menu_model_.reset();
   root_menu_item_view_ = nullptr;
   menu_model_adapter_.reset();

ash/app_list/views/apps_grid_context_menu.h

@@ -76,10 +76,6 @@ class ASH_EXPORT AppsGridContextMenu : public ui::SimpleMenuModel::Delegate,
 
   // The root menu item view of `context_menu_model_`. Cached for testing.
   views::MenuItemView* root_menu_item_view_ = nullptr;
-
-  // The submenu model that contains name reorder options used in
-  // `context_menu_model_`.
-  std::unique_ptr<ui::SimpleMenuModel> reorder_name_submenu_;
 };
 
 }  // namespace ash

ash/app_list/views/apps_grid_view_unittest.cc

@@ -4404,41 +4404,10 @@ TEST_P(AppsGridViewAppSortTest, ContextMenuInTopLevelAppListSortAllApps) {
   const gfx::Point reorder_option_point =
       reorder_option->GetBoundsInScreen().CenterPoint();
   SimulateLeftClickOrTapAt(reorder_option_point);
-  ASSERT_TRUE(reorder_option->SubmenuIsShowing());
-
-  // Sort the apps by their name in alphabetical order.
-  const gfx::Point alphabetical_option = reorder_option->GetSubmenu()
-                                             ->GetMenuItemAt(0)
-                                             ->GetBoundsInScreen()
-                                             .CenterPoint();
-  SimulateLeftClickOrTapAt(alphabetical_option);
   EXPECT_EQ(AppListSortOrder::kNameAlphabetical,
             model_->requested_sort_order());
   EXPECT_FALSE(context_menu->IsMenuShowing());
 
-  // Open the menu again to test the reverse alphabetical sort option.
-  SimulateRightClickOrLongPressAt(empty_space);
-  EXPECT_TRUE(context_menu->IsMenuShowing());
-
-  // Cache the current context menu view.
-  reorder_option =
-      context_menu->root_menu_item_view()->GetSubmenu()->GetMenuItemAt(1);
-  ASSERT_TRUE(reorder_option->title() == u"Name");
-
-  // Open the Reorder by Name submenu.
-  SimulateLeftClickOrTapAt(reorder_option_point);
-  ASSERT_TRUE(reorder_option->SubmenuIsShowing());
-
-  // Sort the apps by their name in reverse alphabetical order.
-  const gfx::Point reverse_option = reorder_option->GetSubmenu()
-                                        ->GetMenuItemAt(1)
-                                        ->GetBoundsInScreen()
-                                        .CenterPoint();
-  SimulateLeftClickOrTapAt(reverse_option);
-  EXPECT_EQ(AppListSortOrder::kNameReverseAlphabetical,
-            model_->requested_sort_order());
-  EXPECT_FALSE(context_menu->IsMenuShowing());
-
   // Open the menu again to test the color sort option.
   SimulateRightClickOrLongPressAt(empty_space);
   EXPECT_TRUE(context_menu->IsMenuShowing());
@@ -4489,43 +4458,10 @@ TEST_P(AppsGridViewAppSortTest, ContextMenuOnFolderItemSortAllApps) {
   gfx::Point reorder_option_point =
       reorder_option->GetBoundsInScreen().CenterPoint();
   SimulateLeftClickOrTapAt(reorder_option_point);
-  ASSERT_TRUE(reorder_option->SubmenuIsShowing());
-
-  // Sort the apps by their name in alphabetical order.
-  const gfx::Point alphabetical_option = reorder_option->GetSubmenu()
-                                             ->GetMenuItemAt(0)
-                                             ->GetBoundsInScreen()
-                                             .CenterPoint();
-  SimulateLeftClickOrTapAt(alphabetical_option);
   EXPECT_EQ(AppListSortOrder::kNameAlphabetical,
             model_->requested_sort_order());
   EXPECT_FALSE(context_menu->IsMenuShowing());
 
-  // Open the menu again to test the reverse alphabetical sort option.
-  folder_item_point = folder_item->GetBoundsInScreen().CenterPoint();
-  SimulateRightClickOrLongPressAt(folder_item_point);
-  EXPECT_TRUE(context_menu->IsMenuShowing());
-
-  // Cache the current context menu view.
-  reorder_option =
-      context_menu->root_menu_item_view()->GetSubmenu()->GetMenuItemAt(1);
-  ASSERT_TRUE(reorder_option->title() == u"Name");
-
-  // Open the Reorder by Name submenu.
-  reorder_option_point = reorder_option->GetBoundsInScreen().CenterPoint();
-  SimulateLeftClickOrTapAt(reorder_option_point);
-  ASSERT_TRUE(reorder_option->SubmenuIsShowing());
-
-  // Sort the apps by their name in reverse alphabetical order.
-  const gfx::Point reverse_option = reorder_option->GetSubmenu()
-                                        ->GetMenuItemAt(1)
-                                        ->GetBoundsInScreen()
-                                        .CenterPoint();
-  SimulateLeftClickOrTapAt(reverse_option);
-  EXPECT_EQ(AppListSortOrder::kNameReverseAlphabetical,
-            model_->requested_sort_order());
-  EXPECT_FALSE(context_menu->IsMenuShowing());
-
   // Open the menu again to test the color sort option.
   SimulateRightClickOrLongPressAt(folder_item_point);
   EXPECT_TRUE(context_menu->IsMenuShowing());