BASELINE: Update Chromium to 77.0.3865.59

Change-Id: I1e89a5f3b009a9519a6705102ad65c92fe736f21
Reviewed-by: Michael Brüning <michael.bruning@qt.io>

4 files changed, 14 insertions, 14 deletions

diff --git a/chromium/components/update_client/component_patcher_unittest.cc b/chromium/components/update_client/component_patcher_unittest.cc
index c292b229044..73204621396 100644
--- a/chromium/components/update_client/component_patcher_unittest.cc
+++ b/chromium/components/update_client/component_patcher_unittest.cc
@@ -13,7 +13,7 @@
 #include "base/run_loop.h"
 #include "base/values.h"
 #include "components/services/patch/patch_service.h"
-#include "components/services/patch/public/interfaces/constants.mojom.h"
+#include "components/services/patch/public/mojom/constants.mojom.h"
 #include "components/update_client/component_patcher_operation.h"
 #include "components/update_client/component_patcher_unittest.h"
 #include "components/update_client/patch/patch_impl.h"
diff --git a/chromium/components/update_client/test_configurator.cc b/chromium/components/update_client/test_configurator.cc
index 26ffc8208c9..8b8ffb95c10 100644
--- a/chromium/components/update_client/test_configurator.cc
+++ b/chromium/components/update_client/test_configurator.cc
@@ -9,8 +9,8 @@
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/version.h"
 #include "components/prefs/pref_service.h"
-#include "components/services/patch/public/interfaces/constants.mojom.h"
-#include "components/services/unzip/public/interfaces/constants.mojom.h"
+#include "components/services/patch/public/mojom/constants.mojom.h"
+#include "components/services/unzip/public/mojom/constants.mojom.h"
 #include "components/update_client/activity_data_service.h"
 #include "components/update_client/net/network_chromium.h"
 #include "components/update_client/patch/patch_impl.h"
diff --git a/chromium/components/update_client/update_checker_unittest.cc b/chromium/components/update_client/update_checker_unittest.cc
index ac4fa08a466..b7f2540f551 100644
--- a/chromium/components/update_client/update_checker_unittest.cc
+++ b/chromium/components/update_client/update_checker_unittest.cc
@@ -323,17 +323,17 @@ TEST_P(UpdateCheckerTest, UpdateCheckSuccess) {
                        .FindKey("fp")
                        ->GetString());
 
-#if (OS_WIN)
-    EXPECT_TRUE(request->FindKey("domainjoined"));
+#if defined(OS_WIN)
+  EXPECT_TRUE(request->FindKey("domainjoined"));
 #if defined(GOOGLE_CHROME_BUILD)
-    const auto* updater = request->FindKey("updater");
-    EXPECT_TRUE(updater);
-    EXPECT_EQ("Omaha", updater->FindKey("name")->GetString());
-    EXPECT_TRUE(updater->FindKey("autoupdatecheckenabled")->is_bool());
-    EXPECT_TRUE(updater->FindKey("ismachine")->is_bool());
-    EXPECT_TRUE(updater->FindKey("updatepolicy")->is_int());
+  const auto* updater = request->FindKey("updater");
+  EXPECT_TRUE(updater);
+  EXPECT_EQ("Omaha", updater->FindKey("name")->GetString());
+  EXPECT_TRUE(updater->FindKey("autoupdatecheckenabled")->is_bool());
+  EXPECT_TRUE(updater->FindKey("ismachine")->is_bool());
+  EXPECT_TRUE(updater->FindKey("updatepolicy")->is_int());
 #endif  // GOOGLE_CHROME_BUILD
-#endif  // OS_WINDOWS
+#endif  // OS_WIN
 
   // Sanity check the arguments of the callback after parsing.
   EXPECT_EQ(ErrorCategory::kNone, error_category_);
diff --git a/chromium/components/update_client/update_client.cc b/chromium/components/update_client/update_client.cc
index 369c6d32c6a..1a12e472757 100644
--- a/chromium/components/update_client/update_client.cc
+++ b/chromium/components/update_client/update_client.cc
@@ -181,14 +181,14 @@ bool UpdateClientImpl::IsUpdating(const std::string& id) const {
 
   for (const auto task : tasks_) {
     const auto ids = task->GetIds();
-    if (base::ContainsValue(ids, id)) {
+    if (base::Contains(ids, id)) {
       return true;
     }
   }
 
   for (const auto task : task_queue_) {
     const auto ids = task->GetIds();
-    if (base::ContainsValue(ids, id)) {
+    if (base::Contains(ids, id)) {
       return true;
     }
   }