BASELINE: Update Chromium to 66.0.3359.156

Change-Id: I0c9831ad39911a086b6377b16f995ad75a51e441
Reviewed-by: Michal Klocek <michal.klocek@qt.io>

1 files changed, 7 insertions, 16 deletions

diff --git a/chromium/dbus/test_service.cc b/chromium/dbus/test_service.cc
index 624495de0c2..e4a236c6459 100644
--- a/chromium/dbus/test_service.cc
+++ b/chromium/dbus/test_service.cc
@@ -10,6 +10,7 @@
 #include <vector>
 
 #include "base/bind.h"
+#include "base/bind_helpers.h"
 #include "base/guid.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
@@ -23,13 +24,6 @@
 #include "dbus/object_path.h"
 #include "dbus/property.h"
 
-namespace {
-
-void EmptyCallback(bool /* success */) {
-}
-
-}  // namespace
-
 namespace dbus {
 
 // Echo, SlowEcho, AsyncEcho, BrokenMethod, GetAll, Get, Set, PerformAction,
@@ -116,11 +110,9 @@ void TestService::SendTestSignalFromRootInternal(const std::string& message) {
   MessageWriter writer(&signal);
   writer.AppendString(message);
 
-  bus_->RequestOwnership(service_name_,
-                         request_ownership_options_,
+  bus_->RequestOwnership(service_name_, request_ownership_options_,
                          base::Bind(&TestService::OnOwnership,
-                                    base::Unretained(this),
-                                    base::Bind(&EmptyCallback)));
+                                    base::Unretained(this), base::DoNothing()));
 
   // Use "/" just like dbus-send does.
   ExportedObject* root_object = bus_->GetExportedObject(ObjectPath("/"));
@@ -189,11 +181,10 @@ void TestService::OnExported(const std::string& interface_name,
   if (num_exported_methods_ == kNumMethodsToExport) {
     // As documented in exported_object.h, the service name should be
     // requested after all methods are exposed.
-    bus_->RequestOwnership(service_name_,
-                           request_ownership_options_,
-                           base::Bind(&TestService::OnOwnership,
-                                      base::Unretained(this),
-                                      base::Bind(&EmptyCallback)));
+    bus_->RequestOwnership(
+        service_name_, request_ownership_options_,
+        base::Bind(&TestService::OnOwnership, base::Unretained(this),
+                   base::DoNothing()));
   }
 }