BASELINE: Update Chromium to 91.0.4472.160

Change-Id: I0def1f08a2412aeed79a9ab95dd50eb5c3f65f31
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

2 files changed, 6 insertions, 4 deletions

diff --git a/chromium/components/browser_sync/active_devices_provider_impl_unittest.cc b/chromium/components/browser_sync/active_devices_provider_impl_unittest.cc
index 5ab9233cd22..20e72ad1847 100644
--- a/chromium/components/browser_sync/active_devices_provider_impl_unittest.cc
+++ b/chromium/components/browser_sync/active_devices_provider_impl_unittest.cc
@@ -35,10 +35,12 @@ std::unique_ptr<DeviceInfo> CreateFakeDeviceInfo(
   return std::make_unique<syncer::DeviceInfo>(
       base::GUID::GenerateRandomV4().AsLowercaseString(), name,
       "chrome_version", "user_agent", sync_pb::SyncEnums::TYPE_UNSET,
-      "device_id", "manufacturer_name", "model_name", last_updated_timestamp,
+      "device_id", "manufacturer_name", "model_name", "full_hardware_class",
+      last_updated_timestamp,
       base::TimeDelta::FromMinutes(kPulseIntervalMinutes),
       /*send_tab_to_self_receiving_enabled=*/false,
-      /*sharing_info=*/base::nullopt, fcm_registration_token,
+      /*sharing_info=*/base::nullopt, /*paask_info=*/base::nullopt,
+      fcm_registration_token,
       /*interested_data_types=*/syncer::ModelTypeSet());
 }
 
diff --git a/chromium/components/browser_sync/signin_confirmation_helper.cc b/chromium/components/browser_sync/signin_confirmation_helper.cc
index 9e46c73cb1c..70a193bfa40 100644
--- a/chromium/components/browser_sync/signin_confirmation_helper.cc
+++ b/chromium/components/browser_sync/signin_confirmation_helper.cc
@@ -5,13 +5,13 @@
 #include "components/browser_sync/signin_confirmation_helper.h"
 
 #include <memory>
+#include <string>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/logging.h"
 #include "base/sequenced_task_runner.h"
-#include "base/strings/string16.h"
 #include "base/threading/sequenced_task_runner_handle.h"
 #include "components/history/core/browser/history_backend.h"
 #include "components/history/core/browser/history_db_task.h"
@@ -82,7 +82,7 @@ void SigninConfirmationHelper::CheckHasHistory(int max_entries) {
   history::QueryOptions opts;
   opts.max_count = max_entries;
   history_service_->QueryHistory(
-      base::string16(), opts,
+      std::u16string(), opts,
       base::BindOnce(&SigninConfirmationHelper::OnHistoryQueryResults,
                      base::Unretained(this), max_entries),
       &task_tracker_);