BASELINE: Update Chromium to 83.0.4103.122

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

8 files changed, 22 insertions, 33 deletions

diff --git a/chromium/dbus/BUILD.gn b/chromium/dbus/BUILD.gn
index f8f8ce3ea21..939f6d2dc04 100644
--- a/chromium/dbus/BUILD.gn
+++ b/chromium/dbus/BUILD.gn
@@ -39,20 +39,14 @@ component("dbus") {
 
   defines = [ "DBUS_IMPLEMENTATION" ]
 
-  deps = [
-    "//third_party/protobuf:protobuf_lite",
-  ]
-  public_deps = [
-    "//base",
-  ]
+  deps = [ "//third_party/protobuf:protobuf_lite" ]
+  public_deps = [ "//base" ]
 
   public_configs = [ "//build/config/linux/dbus" ]
 }
 
 proto_library("test_proto") {
-  sources = [
-    "test_proto.proto",
-  ]
+  sources = [ "test_proto.proto" ]
 }
 
 # This target contains mocks that can be used to write unit tests without
@@ -68,12 +62,8 @@ static_library("test_support") {
     "mock_object_proxy.h",
   ]
 
-  public_deps = [
-    ":dbus",
-  ]
-  deps = [
-    "//testing/gmock",
-  ]
+  public_deps = [ ":dbus" ]
+  deps = [ "//testing/gmock" ]
 
   configs += [ "//build/config/linux/dbus" ]
 }
diff --git a/chromium/dbus/bus.cc b/chromium/dbus/bus.cc
index 80b7526ddc7..aab05d13c5d 100644
--- a/chromium/dbus/bus.cc
+++ b/chromium/dbus/bus.cc
@@ -842,14 +842,14 @@ void Bus::ProcessAllIncomingDataIfAny() {
   }
 }
 
-base::TaskRunner* Bus::GetDBusTaskRunner() {
+base::SequencedTaskRunner* Bus::GetDBusTaskRunner() {
   if (dbus_task_runner_)
     return dbus_task_runner_.get();
   else
     return GetOriginTaskRunner();
 }
 
-base::TaskRunner* Bus::GetOriginTaskRunner() {
+base::SequencedTaskRunner* Bus::GetOriginTaskRunner() {
   DCHECK(origin_task_runner_);
   return origin_task_runner_.get();
 }
diff --git a/chromium/dbus/bus.h b/chromium/dbus/bus.h
index 9c53491fc89..445cd05159d 100644
--- a/chromium/dbus/bus.h
+++ b/chromium/dbus/bus.h
@@ -24,7 +24,6 @@
 
 namespace base {
 class SequencedTaskRunner;
-class TaskRunner;
 }
 
 namespace dbus {
@@ -38,7 +37,7 @@ class ObjectProxy;
 //
 // For asynchronous operations such as an asynchronous method call, the
 // bus object will use a task runner to monitor the underlying file
-// descriptor used for D-Bus communication. By default, the bus will use
+// descriptor used for D-Bus communication. By default, the bus will usegi
 // the current thread's task runner. If |dbus_task_runner| option is
 // specified, the bus will use that task runner instead.
 //
@@ -547,10 +546,10 @@ class CHROME_DBUS_EXPORT Bus : public base::RefCountedThreadSafe<Bus> {
   virtual void UnregisterObjectPath(const ObjectPath& object_path);
 
   // Returns the task runner of the D-Bus thread.
-  virtual base::TaskRunner* GetDBusTaskRunner();
+  virtual base::SequencedTaskRunner* GetDBusTaskRunner();
 
   // Returns the task runner of the thread that created the bus.
-  virtual base::TaskRunner* GetOriginTaskRunner();
+  virtual base::SequencedTaskRunner* GetOriginTaskRunner();
 
   // Returns true if the bus has the D-Bus thread.
   virtual bool HasDBusThread();
diff --git a/chromium/dbus/exported_object.cc b/chromium/dbus/exported_object.cc
index cfb180aba86..0c94833cfa8 100644
--- a/chromium/dbus/exported_object.cc
+++ b/chromium/dbus/exported_object.cc
@@ -11,6 +11,7 @@
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/metrics/histogram_macros.h"
+#include "base/sequenced_task_runner.h"
 #include "base/task_runner.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/time/time.h"
diff --git a/chromium/dbus/mock_bus.h b/chromium/dbus/mock_bus.h
index 22807622786..fddc4ad5ee7 100644
--- a/chromium/dbus/mock_bus.h
+++ b/chromium/dbus/mock_bus.h
@@ -68,8 +68,8 @@ class MockBus : public Bus {
                     void* user_data,
                     DBusError* error));
   MOCK_METHOD1(UnregisterObjectPath, void(const ObjectPath& object_path));
-  MOCK_METHOD0(GetDBusTaskRunner, base::TaskRunner*());
-  MOCK_METHOD0(GetOriginTaskRunner, base::TaskRunner*());
+  MOCK_METHOD0(GetDBusTaskRunner, base::SequencedTaskRunner*());
+  MOCK_METHOD0(GetOriginTaskRunner, base::SequencedTaskRunner*());
   MOCK_METHOD0(HasDBusThread, bool());
   MOCK_METHOD0(AssertOnOriginThread, void());
   MOCK_METHOD0(AssertOnDBusThread, void());
diff --git a/chromium/dbus/object_manager.cc b/chromium/dbus/object_manager.cc
index 65f3603a079..1c406e8cec3 100644
--- a/chromium/dbus/object_manager.cc
+++ b/chromium/dbus/object_manager.cc
@@ -7,6 +7,7 @@
 #include <stddef.h>
 
 #include "base/bind.h"
+#include "base/bind_helpers.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
diff --git a/chromium/dbus/object_proxy.cc b/chromium/dbus/object_proxy.cc
index de5785e9830..1e6a141cef6 100644
--- a/chromium/dbus/object_proxy.cc
+++ b/chromium/dbus/object_proxy.cc
@@ -14,7 +14,6 @@
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/stringprintf.h"
-#include "base/task_runner.h"
 #include "base/task_runner_util.h"
 #include "base/threading/scoped_blocking_call.h"
 #include "base/threading/thread.h"
@@ -53,9 +52,10 @@ constexpr char kNameOwnerChangedMember[] = "NameOwnerChanged";
 }  // namespace
 
 ObjectProxy::ReplyCallbackHolder::ReplyCallbackHolder(
-    scoped_refptr<base::TaskRunner> origin_task_runner,
+    scoped_refptr<base::SequencedTaskRunner> origin_task_runner,
     ResponseOrErrorCallback callback)
-    : origin_task_runner_(origin_task_runner), callback_(std::move(callback)) {
+    : origin_task_runner_(std::move(origin_task_runner)),
+      callback_(std::move(callback)) {
   DCHECK(origin_task_runner_.get());
   DCHECK(!callback_.is_null());
 }
diff --git a/chromium/dbus/object_proxy.h b/chromium/dbus/object_proxy.h
index 676013116ce..b2b509be8c6 100644
--- a/chromium/dbus/object_proxy.h
+++ b/chromium/dbus/object_proxy.h
@@ -16,15 +16,12 @@
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
+#include "base/sequenced_task_runner.h"
 #include "base/strings/string_piece.h"
 #include "base/time/time.h"
 #include "dbus/dbus_export.h"
 #include "dbus/object_path.h"
 
-namespace base {
-class TaskRunner;
-}  // namespace base
-
 namespace dbus {
 
 class Bus;
@@ -225,8 +222,9 @@ class CHROME_DBUS_EXPORT ObjectProxy
    public:
     // Designed to be created on the origin thread.
     // Both |origin_task_runner| and |callback| must not be null.
-    ReplyCallbackHolder(scoped_refptr<base::TaskRunner> origin_task_runner,
-                        ResponseOrErrorCallback callback);
+    ReplyCallbackHolder(
+        scoped_refptr<base::SequencedTaskRunner> origin_task_runner,
+        ResponseOrErrorCallback callback);
 
     // This is movable to be bound to an OnceCallback.
     ReplyCallbackHolder(ReplyCallbackHolder&& other);
@@ -241,7 +239,7 @@ class CHROME_DBUS_EXPORT ObjectProxy
     ResponseOrErrorCallback ReleaseCallback();
 
    private:
-    scoped_refptr<base::TaskRunner> origin_task_runner_;
+    scoped_refptr<base::SequencedTaskRunner> origin_task_runner_;
     ResponseOrErrorCallback callback_;
     DISALLOW_COPY_AND_ASSIGN(ReplyCallbackHolder);
   };