BASELINE: Update Chromium to 56.0.2924.122

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

1 files changed, 8 insertions, 9 deletions

diff --git a/chromium/content/utility/utility_thread_impl.h b/chromium/content/utility/utility_thread_impl.h
index c7e88381385..cd53c948149 100644
--- a/chromium/content/utility/utility_thread_impl.h
+++ b/chromium/content/utility/utility_thread_impl.h
@@ -16,11 +16,7 @@
 #include "content/common/content_export.h"
 #include "content/public/utility/utility_thread.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
-#include "services/shell/public/interfaces/service_factory.mojom.h"
-
-namespace base {
-class FilePath;
-}
+#include "services/service_manager/public/interfaces/service_factory.mojom.h"
 
 namespace content {
 class BlinkPlatformImpl;
@@ -56,18 +52,21 @@ class UtilityThreadImpl : public UtilityThread,
   void OnBatchModeStarted();
   void OnBatchModeFinished();
 
-  void BindServiceFactoryRequest(shell::mojom::ServiceFactoryRequest request);
+  void BindServiceFactoryRequest(
+      service_manager::mojom::ServiceFactoryRequest request);
 
   // True when we're running in batch mode.
   bool batch_mode_;
 
   std::unique_ptr<UtilityBlinkPlatformImpl> blink_platform_impl_;
 
-  // shell::mojom::ServiceFactory for shell::Service hosting.
+  // service_manager::mojom::ServiceFactory for service_manager::Service
+  // hosting.
   std::unique_ptr<UtilityServiceFactory> service_factory_;
 
-  // Bindings to the shell::mojom::ServiceFactory impl.
-  mojo::BindingSet<shell::mojom::ServiceFactory> service_factory_bindings_;
+  // Bindings to the service_manager::mojom::ServiceFactory impl.
+  mojo::BindingSet<service_manager::mojom::ServiceFactory>
+      service_factory_bindings_;
 
   DISALLOW_COPY_AND_ASSIGN(UtilityThreadImpl);
 };