[pull] main from chromium:main

DEPS

@@ -239,15 +239,15 @@ 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': '68e240d9cdb3f09fc0c9de834aaef04aa3b3f579',
+  'skia_revision': 'd337cf94a077c9ddec8f1c7d99c04e2ed14cd553',
   # 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': 'b5bf62dafe52d10d65bfd2e378d658b5b3b04a5e',
   # 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': 'fefd7ae66ad94d8fcb16ef9f5f7304c1b4b9fbf8',
+  'angle_revision': '36fcf80b1f2a99fdaa46d044994dfe96a08d7362',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling SwiftShader
   # and whatever else without interference from each other.
@@ -314,7 +314,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': '5fec567a800a98035a5c7aa02eebf93d3690e484',
+  'devtools_frontend_revision': '895afdf921d39c15ec8b6c072e08d12961f797b1',
   # 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.
@@ -354,7 +354,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': 'f296710f64b6625d204262c09463401def70cea6',
+  'dawn_revision': '5397f9f9d0fa2d4adb03553f60d3fc4d4db5936c',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling feed
   # and whatever else without interference from each other.
@@ -799,7 +799,7 @@ deps = {
     'packages': [
       {
           'package': 'chromium/third_party/androidx',
-          'version': 'Cd5XvW44KjLwajSIYoTsODMnpNKBR--BNLPfpIDKGeAC',
+          'version': '51KZuMRReilT3sNyF1-vaB_9ciuTsRJxv8kUH1eLbDgC',
       },
     ],
     'condition': 'checkout_android',
@@ -964,7 +964,7 @@ deps = {
   },
 
   'src/third_party/breakpad/breakpad':
-    Var('chromium_git') + '/breakpad/breakpad.git' + '@' + '647aa17a7aa8ec0b99ffd005908b8a4ab1995a30',
+    Var('chromium_git') + '/breakpad/breakpad.git' + '@' + '3846f6d297339c17663d7a797ba481b3411f13ad',
 
   'src/third_party/byte_buddy': {
       'packages': [
@@ -1038,7 +1038,7 @@ deps = {
   },
 
   'src/third_party/depot_tools':
-    Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + '2777fd9c6a0ae1d00b9ea5de5fab0a5324e2dd5d',
+    Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + '9e5809e98f33a5f9f9d3b69a5bd826ce8a7a5a81',
 
   'src/third_party/devtools-frontend/src':
     Var('chromium_git') + '/devtools/devtools-frontend' + '@' + Var('devtools_frontend_revision'),
@@ -1639,7 +1639,7 @@ deps = {
     Var('chromium_git') + '/external/khronosgroup/webgl.git' + '@' + 'b1f3776e4913637221733a4da09f3339e783b771',
 
   'src/third_party/webgpu-cts/src':
-    Var('chromium_git') + '/external/github.com/gpuweb/cts.git' + '@' + '216e2ff413d3ed5e7695626bb55ae41575818352',
+    Var('chromium_git') + '/external/github.com/gpuweb/cts.git' + '@' + 'c843f8d63c8c17acfbb7d48e09059a581ba779b9',
 
   'src/third_party/webrtc':
     Var('webrtc_git') + '/src.git' + '@' + '63b97de330fe3d4775b9b4df8ad15c7593d58fc0',
@@ -1700,7 +1700,7 @@ deps = {
     Var('chromium_git') + '/v8/v8.git' + '@' +  Var('v8_revision'),
 
   'src-internal': {
-    'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git@c258c12674403e7c685e3462d136b29560e6b4d8',
+    'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git@41781a31dda1a0a56f41d036cb5333fe84c40645',
     'condition': 'checkout_src_internal',
   },
 

ash/BUILD.gn

@@ -212,6 +212,7 @@ component("ash") {
     "autotest_private_api_utils.cc",
     "bluetooth_devices_observer.cc",
     "bluetooth_devices_observer.h",
+    "bubble/bubble_constants.h",
     "bubble/bubble_utils.cc",
     "bubble/bubble_utils.h",
     "bubble/simple_grid_layout.cc",

ash/app_list/views/app_list_bubble_view.cc

@@ -22,14 +22,14 @@
 #include "ash/app_list/views/scrollable_apps_grid_view.h"
 #include "ash/app_list/views/search_box_view.h"
 #include "ash/app_list/views/search_result_page_dialog_controller.h"
+#include "ash/bubble/bubble_constants.h"
 #include "ash/keyboard/ui/keyboard_ui_controller.h"
 #include "ash/public/cpp/app_list/app_list_config_provider.h"
 #include "ash/public/cpp/metrics_util.h"
 #include "ash/public/cpp/shelf_config.h"
 #include "ash/public/cpp/shelf_types.h"
 #include "ash/search_box/search_box_constants.h"
 #include "ash/style/ash_color_provider.h"
-#include "ash/system/tray/tray_constants.h"
 #include "base/bind.h"
 #include "base/check.h"
 #include "base/check_op.h"
@@ -111,8 +111,7 @@ AppListBubbleView::AppListBubbleView(
   // Set up rounded corners and background blur, similar to TrayBubbleView.
   // Layer color is set in OnThemeChanged().
   SetPaintToLayer(ui::LAYER_SOLID_COLOR);
-  layer()->SetRoundedCornerRadius(
-      gfx::RoundedCornersF{kUnifiedTrayCornerRadius});
+  layer()->SetRoundedCornerRadius(gfx::RoundedCornersF{kBubbleCornerRadius});
   layer()->SetFillsBoundsOpaquely(false);
   layer()->SetIsFastRoundedCorner(true);
   layer()->SetBackgroundBlur(ColorProvider::kBackgroundBlurSigma);

ash/assistant/ui/main_stage/suggestion_chip_view.cc

@@ -24,6 +24,7 @@
 #include "ui/base/metadata/metadata_impl_macros.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_palette.h"
+#include "ui/gfx/font_list.h"
 #include "ui/views/background.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/button/button.h"
@@ -153,8 +154,9 @@ void SuggestionChipView::InitLayout(const AssistantSuggestion& suggestion) {
   text_view_->SetID(kSuggestionChipViewLabel);
   text_view_->SetAutoColorReadabilityEnabled(false);
   text_view_->SetSubpixelRenderingEnabled(false);
-  text_view_->SetFontList(
-      assistant::ui::GetDefaultFontList().DeriveWithSizeDelta(1));
+  const gfx::FontList& font_list = assistant::ui::GetDefaultFontList();
+  text_view_->SetFontList(font_list.Derive(
+      /*size_delta=*/1, font_list.GetFontStyle(), gfx::Font::Weight::MEDIUM));
   SetText(text);
 
   if (!use_dark_light_mode_colors_) {

ash/assistant/ui/main_stage/suggestion_chip_view_unittest.cc

@@ -228,4 +228,18 @@ TEST_F(SuggestionChipViewTest, DarkAndLightModeFlagOff) {
             SkColorSetA(gfx::kGoogleGrey900, 0x14));
 }
 
+TEST_F(SuggestionChipViewTest, FontWeight) {
+  auto widget = CreateFramelessTestWidget();
+  auto* suggestion_chip_view =
+      widget->SetContentsView(std::make_unique<SuggestionChipView>(
+          /*delegate=*/nullptr,
+          CreateSuggestionWithIconUrl(
+              "googleassistant://resource?type=icon&name=assistant")));
+
+  views::Label* label = static_cast<views::Label*>(
+      suggestion_chip_view->GetViewByID(kSuggestionChipViewLabel));
+
+  EXPECT_EQ(label->font_list().GetFontWeight(), gfx::Font::Weight::MEDIUM);
+}
+
 }  // namespace ash

ash/bubble/bubble_constants.h

@@ -0,0 +1,20 @@
+// Copyright 2021 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef ASH_BUBBLE_BUBBLE_CONSTANTS_H_
+#define ASH_BUBBLE_BUBBLE_CONSTANTS_H_
+
+namespace ash {
+
+// The corner radius of a bubble, like the system tray bubble or the
+// productivity launcher bubble.
+constexpr int kBubbleCornerRadius = 16;
+
+// Padding used for bubbles that represent a menu of options, like the system
+// tray bubble or the switch access menu.
+constexpr int kBubbleMenuPadding = 8;
+
+}  // namespace ash
+
+#endif  // ASH_BUBBLE_BUBBLE_CONSTANTS_H_

ash/components/disks/disk_mount_manager.cc

@@ -101,14 +101,13 @@ class DiskMountManagerImpl : public DiskMountManager,
                  MountType type,
                  MountAccessMode access_mode,
                  MountPathCallback callback) override {
-    auto insert_result =
-        mount_callbacks_.insert({source_path, std::move(callback)});
-    if (!insert_result.second) {
+    if (mount_callbacks_.find(source_path) != mount_callbacks_.end()) {
       std::move(callback).Run(
           MOUNT_ERROR_PATH_ALREADY_MOUNTED,
           MountPointInfo(source_path, "", type, MOUNT_CONDITION_NONE));
       return;
     }
+    mount_callbacks_.insert({source_path, std::move(callback)});
     // Hidden and non-existent devices should not be mounted.
     if (type == MOUNT_TYPE_DEVICE) {
       DiskMap::const_iterator it = disks_.find(source_path);

ash/components/disks/disk_mount_manager_unittest.cc

@@ -28,6 +28,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::StringPrintf;
+using testing::_;
 using testing::Field;
 
 namespace ash {
@@ -1097,6 +1098,82 @@ TEST_F(DiskMountManagerTest, MountPath_ReadOnlyDevice) {
   EXPECT_TRUE(disks.find(kReadOnlyDeviceSourcePath)->second->is_read_only());
 }
 
+TEST_F(DiskMountManagerTest, MountPath_DoubleCall) {
+  DiskMountManager* manager = DiskMountManager::GetInstance();
+  const std::string kMountPath1 = "/media/foo";
+
+  base::MockCallback<DiskMountManager::MountPathCallback> mock_callback1;
+
+  manager->MountPath(
+      kDevice1SourcePath, "", "", {}, chromeos::MOUNT_TYPE_DEVICE,
+      chromeos::MOUNT_ACCESS_MODE_READ_WRITE, mock_callback1.Get());
+
+  {
+    // While the first mount is occurring, queue up a second mount for the same
+    // source. It should immediately fail.
+    base::MockCallback<DiskMountManager::MountPathCallback> mock_callback2;
+    EXPECT_CALL(mock_callback2,
+                Run(chromeos::MOUNT_ERROR_PATH_ALREADY_MOUNTED, _));
+
+    manager->MountPath(
+        kDevice1SourcePath, "", "", {}, chromeos::MOUNT_TYPE_DEVICE,
+        chromeos::MOUNT_ACCESS_MODE_READ_WRITE, mock_callback2.Get());
+  }
+
+  // Verify the first mount can complete as expected.
+  EXPECT_CALL(
+      mock_callback1,
+      Run(chromeos::MOUNT_ERROR_NONE,
+          Field(&DiskMountManager::MountPointInfo::mount_path, kMountPath1)));
+  fake_cros_disks_client_->NotifyMountCompleted(
+      chromeos::MOUNT_ERROR_NONE, kDevice1SourcePath,
+      chromeos::MOUNT_TYPE_DEVICE, kMountPath1);
+}
+
+TEST_F(DiskMountManagerTest, MountPath_CallbackCallsMount) {
+  DiskMountManager* manager = DiskMountManager::GetInstance();
+  const std::string kMountPath1 = "/media/foo";
+  const std::string kMountPath2 = "/media/bar";
+
+  base::MockCallback<DiskMountManager::MountPathCallback> mock_callback1;
+
+  // Try call MountPath() again in the complete callback of a MountPath() call.
+  EXPECT_CALL(
+      mock_callback1,
+      Run(chromeos::MOUNT_ERROR_NONE,
+          Field(&DiskMountManager::MountPointInfo::mount_path, kMountPath1)))
+      .WillOnce([=](chromeos::MountError error,
+                    const DiskMountManager::MountPointInfo& mount_info) {
+        // Try remount the same path and verify it fails.
+        base::MockCallback<DiskMountManager::MountPathCallback> mock_callback2;
+        EXPECT_CALL(mock_callback2,
+                    Run(chromeos::MOUNT_ERROR_PATH_ALREADY_MOUNTED, _));
+        manager->MountPath(
+            kDevice1SourcePath, "", "", {}, chromeos::MOUNT_TYPE_DEVICE,
+            chromeos::MOUNT_ACCESS_MODE_READ_WRITE, mock_callback2.Get());
+
+        // Try mount a different path and verify it succeeds.
+        base::MockCallback<DiskMountManager::MountPathCallback> mock_callback3;
+        EXPECT_CALL(mock_callback3,
+                    Run(chromeos::MOUNT_ERROR_NONE,
+                        Field(&DiskMountManager::MountPointInfo::mount_path,
+                              kMountPath2)));
+        manager->MountPath(
+            kDevice2SourcePath, "", "", {}, chromeos::MOUNT_TYPE_DEVICE,
+            chromeos::MOUNT_ACCESS_MODE_READ_WRITE, mock_callback3.Get());
+        fake_cros_disks_client_->NotifyMountCompleted(
+            chromeos::MOUNT_ERROR_NONE, kDevice2SourcePath,
+            chromeos::MOUNT_TYPE_DEVICE, kMountPath2);
+      });
+
+  manager->MountPath(
+      kDevice1SourcePath, "", "", {}, chromeos::MOUNT_TYPE_DEVICE,
+      chromeos::MOUNT_ACCESS_MODE_READ_WRITE, mock_callback1.Get());
+  fake_cros_disks_client_->NotifyMountCompleted(
+      chromeos::MOUNT_ERROR_NONE, kDevice1SourcePath,
+      chromeos::MOUNT_TYPE_DEVICE, kMountPath1);
+}
+
 TEST_F(DiskMountManagerTest, RemountRemovableDrives) {
   DiskMountManager* manager = DiskMountManager::GetInstance();
   // Initially we have 2 mounted devices.

ash/components/tether/active_host.cc

@@ -14,7 +14,7 @@
 #include "components/prefs/pref_registry_simple.h"
 #include "components/prefs/pref_service.h"
 
-namespace chromeos {
+namespace ash {
 
 namespace tether {
 
@@ -261,4 +261,4 @@ void ActiveHost::SendActiveHostChangedUpdate(
 
 }  // namespace tether
 
-}  // namespace chromeos
+}  // namespace ash

ash/components/tether/active_host.h

@@ -16,7 +16,7 @@
 class PrefRegistrySimple;
 class PrefService;
 
-namespace chromeos {
+namespace ash {
 
 namespace tether {
 
@@ -163,6 +163,6 @@ class ActiveHost {
 
 }  // namespace tether
 
-}  // namespace chromeos
+}  // namespace ash
 
 #endif  // ASH_COMPONENTS_TETHER_ACTIVE_HOST_H_

ash/components/tether/active_host_network_state_updater.cc

@@ -10,7 +10,7 @@
 #include "chromeos/components/multidevice/remote_device_ref.h"
 #include "chromeos/network/network_state_handler.h"
 
-namespace chromeos {
+namespace ash {
 
 namespace tether {
 
@@ -80,4 +80,4 @@ void ActiveHostNetworkStateUpdater::OnActiveHostChanged(
 
 }  // namespace tether
 
-}  // namespace chromeos
+}  // namespace ash

ash/components/tether/active_host_network_state_updater.h

@@ -7,10 +7,10 @@
 
 #include "ash/components/tether/active_host.h"
 #include "base/memory/weak_ptr.h"
+// TODO(https://crbug.com/1164001): move to forward declaration
+#include "chromeos/network/network_state_handler.h"
 
-namespace chromeos {
-
-class NetworkStateHandler;
+namespace ash {
 
 namespace tether {
 
@@ -38,6 +38,6 @@ class ActiveHostNetworkStateUpdater final : public ActiveHost::Observer {
 
 }  // namespace tether
 
-}  // namespace chromeos
+}  // namespace ash
 
 #endif  // ASH_COMPONENTS_TETHER_ACTIVE_HOST_NETWORK_STATE_UPDATER_H_

ash/components/tether/active_host_network_state_updater_unittest.cc

@@ -17,7 +17,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/cros_system_api/dbus/shill/dbus-constants.h"
 
-namespace chromeos {
+namespace ash {
 
 namespace tether {
 
@@ -129,4 +129,4 @@ TEST_F(ActiveHostNetworkStateUpdaterTest, TestActiveHostUpdates) {
 
 }  // namespace tether
 
-}  // namespace chromeos
+}  // namespace ash

ash/components/tether/active_host_unittest.cc

@@ -15,7 +15,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 
-namespace chromeos {
+namespace ash {
 
 namespace tether {
 
@@ -219,4 +219,4 @@ TEST_F(ActiveHostTest, TestObserverCalls) {
 
 }  // namespace tether
 
-}  // namespace chromeos
+}  // namespace ash

ash/components/tether/asynchronous_shutdown_object_container.h

@@ -7,7 +7,7 @@
 
 #include "base/callback_forward.h"
 
-namespace chromeos {
+namespace ash {
 
 namespace tether {
 
@@ -45,6 +45,6 @@ class AsynchronousShutdownObjectContainer {
 
 }  // namespace tether
 
-}  // namespace chromeos
+}  // namespace ash
 
 #endif  // ASH_COMPONENTS_TETHER_ASYNCHRONOUS_SHUTDOWN_OBJECT_CONTAINER_H_