From e733310db58160074f574c429d48f8308c0afe17 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Wed, 8 Mar 2017 10:28:10 +0100 Subject: BASELINE: Update Chromium to 56.0.2924.122 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I4e04de8f47e47e501c46ed934c76a431c6337ced Reviewed-by: Michael Brüning --- chromium/content/utility/utility_thread_impl.h | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'chromium/content/utility/utility_thread_impl.h') 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 blink_platform_impl_; - // shell::mojom::ServiceFactory for shell::Service hosting. + // service_manager::mojom::ServiceFactory for service_manager::Service + // hosting. std::unique_ptr service_factory_; - // Bindings to the shell::mojom::ServiceFactory impl. - mojo::BindingSet service_factory_bindings_; + // Bindings to the service_manager::mojom::ServiceFactory impl. + mojo::BindingSet + service_factory_bindings_; DISALLOW_COPY_AND_ASSIGN(UtilityThreadImpl); }; -- cgit v1.2.1