BASELINE: Update Chromium to 72.0.3626.110 and Ninja to 1.9.0

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

8 files changed, 13 insertions, 12 deletions

diff --git a/chromium/components/cast_channel/OWNERS b/chromium/components/cast_channel/OWNERS
index 3590d525052..e4a5810f3a9 100644
--- a/chromium/components/cast_channel/OWNERS
+++ b/chromium/components/cast_channel/OWNERS
@@ -1,4 +1,3 @@
-imcheng@chromium.org
 mfoltz@chromium.org
 
-# COMPONENT: Internals>Cast>API
+# COMPONENT: Internals>Cast>Providers
diff --git a/chromium/components/cast_channel/cast_auth_util_unittest.cc b/chromium/components/cast_channel/cast_auth_util_unittest.cc
index 5a9df906f5c..a3bc1944de6 100644
--- a/chromium/components/cast_channel/cast_auth_util_unittest.cc
+++ b/chromium/components/cast_channel/cast_auth_util_unittest.cc
@@ -330,7 +330,7 @@ bool RunTest(const cast_certificate::DeviceCertTest& test_case) {
           cast_trust_store.get(), crl_trust_store.get());
       EXPECT_EQ(result.error_type, AuthResult::ERROR_SIGNED_BLOBS_MISMATCH);
       return result.error_type == AuthResult::ERROR_SIGNED_BLOBS_MISMATCH;
-    case UNSPECIFIED:
+    case cast_certificate::UNSPECIFIED:
       return false;
   }
   return false;
diff --git a/chromium/components/cast_channel/cast_message_handler.cc b/chromium/components/cast_channel/cast_message_handler.cc
index b759e34588f..2f56a82fa71 100644
--- a/chromium/components/cast_channel/cast_message_handler.cc
+++ b/chromium/components/cast_channel/cast_message_handler.cc
@@ -58,7 +58,7 @@ InternalMessage::~InternalMessage() = default;
 CastMessageHandler::CastMessageHandler(
     CastSocketService* socket_service,
     std::unique_ptr<service_manager::Connector> connector,
-    const std::string& data_decoder_batch_id,
+    const base::Token& data_decoder_batch_id,
     const std::string& user_agent,
     const std::string& browser_version,
     const std::string& locale)
diff --git a/chromium/components/cast_channel/cast_message_handler.h b/chromium/components/cast_channel/cast_message_handler.h
index 69ef61d8cd6..0e13ea1513b 100644
--- a/chromium/components/cast_channel/cast_message_handler.h
+++ b/chromium/components/cast_channel/cast_message_handler.h
@@ -13,6 +13,7 @@
 #include "base/memory/weak_ptr.h"
 #include "base/sequence_checker.h"
 #include "base/time/tick_clock.h"
+#include "base/token.h"
 #include "base/values.h"
 #include "components/cast_channel/cast_message_util.h"
 #include "components/cast_channel/cast_socket.h"
@@ -122,7 +123,7 @@ class CastMessageHandler : public CastSocket::Observer {
   // |data_decoder_batch_id|: Batch ID used for data_decoder service.
   CastMessageHandler(CastSocketService* socket_service,
                      std::unique_ptr<service_manager::Connector> connector,
-                     const std::string& data_decoder_batch_id,
+                     const base::Token& data_decoder_batch_id,
                      const std::string& user_agent,
                      const std::string& browser_version,
                      const std::string& locale);
@@ -243,7 +244,7 @@ class CastMessageHandler : public CastSocket::Observer {
 
   // Used for parsing JSON payload from receivers.
   std::unique_ptr<service_manager::Connector> connector_;
-  const std::string data_decoder_batch_id_;
+  const base::Token data_decoder_batch_id_;
 
   // User agent and browser version strings included in virtual connection
   // messages.
diff --git a/chromium/components/cast_channel/cast_message_handler_unittest.cc b/chromium/components/cast_channel/cast_message_handler_unittest.cc
index 2821a5a7a18..f047e8c7ab4 100644
--- a/chromium/components/cast_channel/cast_message_handler_unittest.cc
+++ b/chromium/components/cast_channel/cast_message_handler_unittest.cc
@@ -61,7 +61,7 @@ class CastMessageHandlerTest : public testing::Test {
         cast_socket_service_(new base::TestSimpleTaskRunner()),
         handler_(&cast_socket_service_,
                  /* connector */ nullptr,
-                 "batchId",
+                 base::Token{1, 1},
                  kTestUserAgentString,
                  "66.0.3331.0",
                  "en-US") {
diff --git a/chromium/components/cast_channel/cast_test_util.cc b/chromium/components/cast_channel/cast_test_util.cc
index f8a6ff9e258..79433ed3aa1 100644
--- a/chromium/components/cast_channel/cast_test_util.cc
+++ b/chromium/components/cast_channel/cast_test_util.cc
@@ -6,6 +6,7 @@
 
 #include <utility>
 
+#include "base/token.h"
 #include "net/base/ip_address.h"
 #include "services/service_manager/public/cpp/connector.h"
 
@@ -52,7 +53,7 @@ MockCastMessageHandler::MockCastMessageHandler(
     MockCastSocketService* socket_service)
     : CastMessageHandler(socket_service,
                          /* connector */ nullptr,
-                         "batchId",
+                         base::Token{},
                          "userAgent",
                          "1.2.3.4",
                          "en-US") {}
diff --git a/chromium/components/cast_channel/cast_transport_unittest.cc b/chromium/components/cast_channel/cast_transport_unittest.cc
index 022dc2532e4..a82935d8546 100644
--- a/chromium/components/cast_channel/cast_transport_unittest.cc
+++ b/chromium/components/cast_channel/cast_transport_unittest.cc
@@ -11,8 +11,8 @@
 #include "base/containers/queue.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
-#include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
+#include "base/test/scoped_task_environment.h"
 #include "base/test/simple_test_clock.h"
 #include "components/cast_channel/cast_framer.h"
 #include "components/cast_channel/cast_socket.h"
@@ -163,7 +163,7 @@ class CastTransportTest : public testing::Test {
     run_loop.RunUntilIdle();
   }
 
-  base::MessageLoop message_loop_;
+  base::test::ScopedTaskEnvironment task_environment_;
   MockCastTransportDelegate* delegate_;
   MockSocket mock_socket_;
   Logger* logger_;
diff --git a/chromium/components/cast_channel/keep_alive_delegate_unittest.cc b/chromium/components/cast_channel/keep_alive_delegate_unittest.cc
index 7fead85a59a..087e0339c72 100644
--- a/chromium/components/cast_channel/keep_alive_delegate_unittest.cc
+++ b/chromium/components/cast_channel/keep_alive_delegate_unittest.cc
@@ -9,8 +9,8 @@
 #include "base/json/json_writer.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
-#include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
+#include "base/test/scoped_task_environment.h"
 #include "base/test/test_mock_time_task_runner.h"
 #include "base/time/tick_clock.h"
 #include "base/timer/mock_timer.h"
@@ -97,7 +97,7 @@ class KeepAliveDelegateTest : public testing::Test {
     run_loop.RunUntilIdle();
   }
 
-  base::MessageLoop message_loop_;
+  base::test::ScopedTaskEnvironment task_environment_;
   MockCastSocket socket_;
   std::unique_ptr<KeepAliveDelegate> keep_alive_;
   scoped_refptr<Logger> logger_;