Merge branch 'master' of https://chromium.googlesource.com/chromium/src…

… into master.lion

DEPS

@@ -199,19 +199,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': '54515b7b2b994b1d439a3a3bfa4f0517c9a981f4',
+  'skia_revision': '8f282f5d9f30aeb5e3122735723b403203511370',
   # 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': '6bb19707a491fda7a4dc04dbbeb188d48f6d641d',
+  'v8_revision': '5d60a181de0863d8d00ae42ec0ee3521f51b501a',
   # 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': '1a072711d4388c62e02480fabc26c68c24494be9',
   # 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': '767af74ec9b6199fdf6b03685d2e1587a22ff3f4',
+  'angle_revision': '51603c63d1cb9e36afaf2069fc069e542ac2f3fb',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling SwiftShader
   # and whatever else without interference from each other.
@@ -274,7 +274,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': '3be8a6b93877d993647ad38ca1cb9dbc9c2d139b',
+  'devtools_frontend_revision': '08a23169282404c7bc2b0be0c5469e31c0d3171a',
   # 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.
@@ -893,7 +893,7 @@ deps = {
   },
 
   'src/third_party/depot_tools':
-    Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + '0e4e5ae5944afdca30a6228cb2b56c8298e07a70',
+    Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + 'c1aa4ecfcc8cbbbcf21e1b77125aa602339846ec',
 
   'src/third_party/devtools-frontend/src':
     Var('chromium_git') + '/devtools/devtools-frontend' + '@' + Var('devtools_frontend_revision'),
@@ -1344,7 +1344,7 @@ deps = {
       'packages': [
           {
               'package': 'fuchsia/third_party/aemu/linux-amd64',
-              'version': 'luM2HIHgfBKxr1C7UPo8RdQPAvyLNd74T9rYfhWFOC8C'
+              'version': 'xAHa1IXmKteChkPvba9ezjSnKL7IyDePQRzWVUEAx9UC'
           },
       ],
       'condition': 'host_os == "linux" and checkout_fuchsia',
@@ -1518,7 +1518,7 @@ deps = {
     Var('chromium_git') + '/external/github.com/gpuweb/cts.git' + '@' + '3c2fe3888658d82b47ca831d59a2e07579619c2d',
 
   'src/third_party/webrtc':
-    Var('webrtc_git') + '/src.git' + '@' + '783278a3109df8d2e362861e52fd0deea851633c',
+    Var('webrtc_git') + '/src.git' + '@' + '42082f9045e74e65b9e3a66b51093e0dc2f9375a',
 
   'src/third_party/libgifcodec':
      Var('skia_git') + '/libgifcodec' + '@'+  Var('libgifcodec_revision'),
@@ -1590,7 +1590,7 @@ deps = {
     Var('chromium_git') + '/v8/v8.git' + '@' +  Var('v8_revision'),
 
   'src-internal': {
-    'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git@324ea4f154d8d0816a31b6d4cc573af81769a8f6',
+    'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git@d043aed16479cfa9dc746047aaad535765588675',
     'condition': 'checkout_src_internal',
   },
 

ash/accelerometer/accelerometer_file_reader.cc

@@ -373,7 +373,7 @@ void AccelerometerFileReader::SetStatesWithInitializationResult(
       // If we haven't yet passed the timeout cutoff, try this again. This will
       // be scheduled at the same rate as reading.
       if (base::TimeTicks::Now() < initialization_timeout_) {
-        blocking_task_runner_->PostDelayedTask(
+        ui_task_runner_->PostDelayedTask(
             FROM_HERE,
             base::BindOnce(&AccelerometerFileReader::TryScheduleInitialize,
                            this),

ash/assistant/assistant_interaction_controller_impl.cc

@@ -148,24 +148,6 @@ void AssistantInteractionControllerImpl::StartTextInteraction(
   assistant_->StartTextInteraction(text, query_source, allow_tts);
 }
 
-void AssistantInteractionControllerImpl::StartBloomInteraction() {
-  // TODO(jeroendh): Test.
-  StopActiveInteraction(false);
-
-  AssistantUiController::Get()->ShowUi(AssistantEntryPoint::kBloom);
-
-  OnInteractionStarted(AssistantInteractionMetadata(
-      AssistantInteractionType::kText, AssistantQuerySource::kBloom,
-      /*query=*/"processing query"));
-}
-
-void AssistantInteractionControllerImpl::ShowBloomResult(
-    const std::string& html) {
-  // TODO(jeroendh) ensure we're in a bloom interaction
-
-  OnHtmlResponse(html, /*fallback=*/"");
-}
-
 void AssistantInteractionControllerImpl::OnAssistantControllerConstructed() {
   AssistantUiController::Get()->GetModel()->AddObserver(this);
   assistant_controller_->view_delegate()->AddObserver(this);

ash/assistant/assistant_interaction_controller_impl.h

@@ -69,8 +69,6 @@ class AssistantInteractionControllerImpl
   void StartTextInteraction(const std::string& text,
                             bool allow_tts,
                             AssistantQuerySource query_source) override;
-  void StartBloomInteraction() override;
-  void ShowBloomResult(const std::string& html) override;
 
   // AssistantControllerObserver:
   void OnAssistantControllerConstructed() override;

ash/assistant/util/assistant_util.cc

@@ -47,7 +47,6 @@ bool IsVoiceEntryPoint(AssistantEntryPoint entry_point, bool prefer_voice) {
     case AssistantEntryPoint::kProactiveSuggestions:
     case AssistantEntryPoint::kSetup:
     case AssistantEntryPoint::kStylus:
-    case AssistantEntryPoint::kBloom:
       return false;
   }
 }

ash/public/cpp/assistant/controller/assistant_interaction_controller.h

@@ -41,10 +41,6 @@ class ASH_PUBLIC_EXPORT AssistantInteractionController {
       bool allow_tts,
       chromeos::assistant::AssistantQuerySource source) = 0;
 
-  // Start Bloom interaction.
-  virtual void StartBloomInteraction() = 0;
-  virtual void ShowBloomResult(const std::string& html) = 0;
-
  protected:
   AssistantInteractionController();
   virtual ~AssistantInteractionController();

ash/public/cpp/holding_space/holding_space_constants.h

@@ -16,22 +16,13 @@ constexpr int kHoldingSpaceBubbleContainerChildSpacing = 8;
 constexpr int kHoldingSpaceBubbleWidth = 360;
 constexpr gfx::Insets kHoldingSpaceChildBubblePadding(16);
 constexpr int kHoldingSpaceChildBubbleChildSpacing = 16;
-constexpr gfx::Insets kHoldingSpaceChipPadding(8);
-constexpr int kHoldingSpaceChipChildSpacing = 8;
-constexpr int kHoldingSpaceChipHeight = 40;
 constexpr int kHoldingSpaceChipIconSize = 24;
-constexpr int kHoldingSpaceChipWidth = 160;
-constexpr int kHoldingSpaceChipLabelMaskGradientWidth = 16;
-constexpr int kHoldingSpaceChipsPerRow = 2;
-constexpr int kHoldingSpaceColumnSpacing = 8;
-constexpr int kHoldingSpaceColumnWidth = 160;
 constexpr int kHoldingSpaceContextMenuMargin = 8;
 constexpr int kHoldingSpaceCornerRadius = 8;
 constexpr int kHoldingSpaceDownloadsChevronIconSize = 20;
 constexpr int kHoldingSpaceDownloadsHeaderSpacing = 16;
 constexpr int kHoldingSpaceFocusInsets = -2;
 constexpr int kHoldingSpaceIconSize = 20;
-constexpr int kHoldingSpaceRowSpacing = 8;
 constexpr gfx::Insets kHoldingSpaceScreenCapturePadding(8);
 constexpr gfx::Size kHoldingSpaceScreenCapturePinButtonSize(24, 24);
 constexpr gfx::Size kHoldingSpaceScreenCapturePlayIconSize(32, 32);

ash/system/holding_space/holding_space_item_chip_view.cc

@@ -15,6 +15,7 @@
 #include "ui/compositor/paint_recorder.h"
 #include "ui/gfx/skia_paint_util.h"
 #include "ui/views/background.h"
+#include "ui/views/border.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/fill_layout.h"
@@ -23,6 +24,14 @@
 
 namespace ash {
 
+// Appearance.
+constexpr int kChildSpacing = 8;
+constexpr int kLabelMaskGradientWidth = 16;
+constexpr gfx::Insets kLabelMargins(0, 0, 0, /*right=*/2);
+constexpr gfx::Insets kPadding(8, 8, 8, /*right=*/10);
+constexpr int kPreferredHeight = 40;
+constexpr int kPreferredWidth = 160;
+
 // CirclePainter ---------------------------------------------------------------
 
 class CirclePainter : public views::Painter {
@@ -91,9 +100,8 @@ class HoldingSpaceItemChipView::LabelMaskLayerOwner : public ui::LayerDelegate {
     flags.setAntiAlias(false);
 
     gfx::Point gradient_end(size.width() - kHoldingSpaceIconSize, 0);
-    gfx::Point gradient_start(
-        gradient_end.x() - kHoldingSpaceChipLabelMaskGradientWidth,
-        gradient_end.y());
+    gfx::Point gradient_start(gradient_end.x() - kLabelMaskGradientWidth,
+                              gradient_end.y());
     flags.setShader(gfx::CreateGradientShader(
         gradient_start, gradient_end, SK_ColorBLACK, SK_ColorTRANSPARENT));
 
@@ -113,12 +121,11 @@ HoldingSpaceItemChipView::HoldingSpaceItemChipView(
     const HoldingSpaceItem* item)
     : HoldingSpaceItemView(delegate, item) {
   auto* layout = SetLayoutManager(std::make_unique<views::BoxLayout>(
-      views::BoxLayout::Orientation::kHorizontal,
-      gfx::Insets(kHoldingSpaceChipPadding), kHoldingSpaceChipChildSpacing));
+      views::BoxLayout::Orientation::kHorizontal, kPadding, kChildSpacing));
   layout->set_cross_axis_alignment(
       views::BoxLayout::CrossAxisAlignment::kCenter);
 
-  SetPreferredSize(gfx::Size(kHoldingSpaceChipWidth, kHoldingSpaceChipHeight));
+  SetPreferredSize(gfx::Size(kPreferredWidth, kPreferredHeight));
 
   image_ = AddChildView(std::make_unique<RoundedImageView>(
       kHoldingSpaceChipIconSize / 2, RoundedImageView::Alignment::kLeading));
@@ -145,6 +152,7 @@ HoldingSpaceItemChipView::HoldingSpaceItemChipView(
 
   label_ = label_and_pin_button_container_->AddChildView(
       holding_space_util::CreateLabel(holding_space_util::LabelStyle::kChip));
+  label_->SetBorder(views::CreateEmptyBorder(kLabelMargins));
   label_->SetElideBehavior(gfx::ELIDE_MIDDLE);
   label_->SetHorizontalAlignment(gfx::HorizontalAlignment::ALIGN_LEFT);
   label_->SetText(item->text());

ash/system/holding_space/holding_space_item_chips_container.cc

@@ -12,6 +12,10 @@
 namespace ash {
 namespace {
 
+// Appearance.
+constexpr int kNumberOfChipsPerRow = 2;
+constexpr int kSpacing = 8;
+
 // Need a custom grid layout to facilitate removal of views from the grid,
 // which can change the number of rows required. views::GridLayout makes this
 // case difficult.
@@ -110,8 +114,8 @@ class SimpleGridLayout : public views::LayoutManagerBase {
 
 HoldingSpaceItemChipsContainer::HoldingSpaceItemChipsContainer() {
   SetLayoutManager(std::make_unique<SimpleGridLayout>(
-      kHoldingSpaceChipsPerRow, kHoldingSpaceColumnSpacing,
-      kHoldingSpaceRowSpacing));
+      kNumberOfChipsPerRow, /*column_spacing=*/kSpacing,
+      /*row_spacing=*/kSpacing));
 }
 
 HoldingSpaceItemChipsContainer::~HoldingSpaceItemChipsContainer() = default;

build/fuchsia/linux.sdk.sha1

@@ -1 +1 @@
-0.20210108.2.1
+0.20210109.0.1

build/fuchsia/mac.sdk.sha1

@@ -1 +1 @@
-0.20210108.2.1
+0.20210109.0.1

chrome/VERSION

@@ -1,4 +1,4 @@
 MAJOR=89
 MINOR=0
-BUILD=4383
+BUILD=4384
 PATCH=0

chrome/browser/flag_descriptions.cc

@@ -89,11 +89,6 @@ const char kEditPasswordsInSettingsName[] = "Edit passwords in settings";
 const char kEditPasswordsInSettingsDescription[] =
     "Enables password editing in settings.";
 
-const char kEnableBloomName[] = "Enable Bloom Integration";
-const char kEnableBloomDescription[] =
-    "Enables native support for bloom, an experimental vertical knowledge "
-    "search feature.";
-
 const char kEnableBluetoothSerialPortProfileInSerialApiName[] =
     "Enable Bluetooth Serial Port Profile in Serial API";
 const char kEnableBluetoothSerialPortProfileInSerialApiDescription[] =

chrome/browser/flag_descriptions.h

@@ -88,9 +88,6 @@ extern const char kDetectFormSubmissionOnFormClearDescription[];
 extern const char kEditPasswordsInSettingsName[];
 extern const char kEditPasswordsInSettingsDescription[];
 
-extern const char kEnableBloomName[];
-extern const char kEnableBloomDescription[];
-
 extern const char kEnableBluetoothSerialPortProfileInSerialApiName[];
 extern const char kEnableBluetoothSerialPortProfileInSerialApiDescription[];
 

chrome/browser/resources/chromeos/accessibility/chromevox/testing/chromevox_webui_test_base.js

@@ -2,8 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-GEN_INCLUDE(['../../common/testing/assert_additions.js']);
-GEN_INCLUDE(['common.js', '../../common/testing/callback_helper.js']);
+// clang-format off
+GEN_INCLUDE([
+  '../../common/testing/assert_additions.js',
+  '../../common/testing/common.js',
+  '../../common/testing/callback_helper.js'
+]);
+// clang-format on
 
 /**
  * Base test fixture for ChromeVox webui tests. Run in a Blink renderer.

chrome/browser/resources/chromeos/accessibility/chromevox/testing/common.js

@@ -99,18 +99,3 @@ class TestUtils {
     });
   }
 }
-
-/**
- * Similar to |TEST_F|. Generates a test for the given |testFixture|,
- * |testName|, and |testFunction|.
- * Used this variant when an |isAsync| fixture wants to temporarily mix in an
- * sync test.
- * @param {string} testFixture Fixture name.
- * @param {string} testName Test name.
- * @param {function} testFunction The test impl.
- */
-function SYNC_TEST_F(testFixture, testName, testFunction) {
-  TEST_F(testFixture, testName, function() {
-    this.newCallback(testFunction)();
-  });
-}

chrome/browser/resources/chromeos/accessibility/common/testing/common.js

@@ -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.
+
+/** @fileoverview File containing test framework helper functions. */
+
+/**
+ * Similar to |TEST_F|. Generates a test for the given |testFixture|,
+ * |testName|, and |testFunction|.
+ * Used this variant when an |isAsync| fixture wants to temporarily mix in a
+ * sync test.
+ * @param {string} testFixture Fixture name.
+ * @param {string} testName Test name.
+ * @param {function} testFunction The test impl.
+ */
+function SYNC_TEST_F(testFixture, testName, testFunction) {
+  TEST_F(testFixture, testName, function() {
+    this.newCallback(testFunction)();
+  });
+}

chrome/browser/resources/chromeos/accessibility/common/testing/e2e_test_base.js

@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-GEN_INCLUDE(['assert_additions.js', 'callback_helper.js', 'doc_utils.js']);
+GEN_INCLUDE(
+    ['assert_additions.js', 'callback_helper.js', 'common.js', 'doc_utils.js']);
 
 /**
  * Base test fixture for end to end tests (tests that need a full extension
@@ -167,18 +168,3 @@ E2ETestBase.prototype.isAsync = true;
  * No UI in the background context.
  */
 E2ETestBase.prototype.runAccessibilityChecks = false;
-
-/**
- * Similar to |TEST_F|. Generates a test for the given |testFixture|,
- * |testName|, and |testFunction|.
- * Used this variant when an |isAsync| fixture wants to temporarily mix in an
- * sync test.
- * @param {string} testFixture Fixture name.
- * @param {string} testName Test name.
- * @param {function} testFunction The test impl.
- */
-function SYNC_TEST_F(testFixture, testName, testFunction) {
-  TEST_F(testFixture, testName, function() {
-    this.newCallback(testFunction)();
-  });
-}

chrome/browser/resources/chromeos/accessibility/select_to_speak/BUILD.gn

@@ -77,6 +77,7 @@ source_set("browser_tests") {
 js2gtest("select_to_speak_extjs_tests") {
   test_type = "extension"
   sources = [
+    # These are end-to-end tests.
     "paragraph_utils_overflow_test.js",
     "select_to_speak_keystroke_selection_test.js",
     "select_to_speak_mouse_selection_test.js",

chrome/build/linux.pgo.txt

@@ -1 +1 @@
-chrome-linux-master-1610150355-4a8e87c65afe038c52dde92bd9ad8141fba84ab9.profdata
+chrome-linux-master-1610193586-93f61022a3f2638e289b0e08a26785a26ecf4b4e.profdata

chrome/build/win32.pgo.txt

@@ -1 +1 @@
-chrome-win32-master-1610107094-5d3c24229731decbd402a4499ebb6cac6decdedb.profdata
+chrome-win32-master-1610182453-e2cbc7061497e20c547b73150f9f3abdd20c3cdf.profdata

chrome/build/win64.pgo.txt

@@ -1 +1 @@
-chrome-win64-master-1610139561-9d7df42b937a5193cd789e89275356fd04ecc110.profdata
+chrome-win64-master-1610182453-e2d19885b1bfeea6bc0ced33d1b3a64e0380c0bb.profdata

chromeos/components/scanning/resources/scan_preview.html

@@ -58,6 +58,10 @@
     width: calc(100% - 2px);
   }
 
+  .scanned-image {
+    display: block;
+  }
+
   /* Add top margin to all but the first scanned image. */
   .scanned-image:nth-of-type(n+2) {
     margin-top: 8px;

chromeos/services/assistant/assistant_manager_service_impl.cc

@@ -148,9 +148,6 @@ const char* ToTriggerSource(AssistantEntryPoint entry_point) {
       return kEntryPointProactiveSuggestions;
     case AssistantEntryPoint::kLauncherChip:
       return kEntryPointLauncherChip;
-    case AssistantEntryPoint::kBloom:
-      return kEntryPointUnspecified;  // TODO(jeroendh): Use Bloom specific
-                                      // entrypoint
   }
 }