Rename shell namespace to service_manager

content/browser/service_manager/service_manager_context.cc

Index: content/browser/service_manager/service_manager_context.cc
diff --git a/content/browser/service_manager/service_manager_context.cc b/content/browser/service_manager/service_manager_context.cc
index 5126f922d0667772c3e69e00c6e44b47553b9b33..92ff7652101af04ec2c6220d843c2553abed86a1 100644
--- a/content/browser/service_manager/service_manager_context.cc
+++ b/content/browser/service_manager/service_manager_context.cc
@@ -43,14 +43,15 @@ namespace content {
 
 namespace {
 
-base::LazyInstance<std::unique_ptr<shell::Connector>>::Leaky
+base::LazyInstance<std::unique_ptr<service_manager::Connector>>::Leaky
     g_io_thread_connector = LAZY_INSTANCE_INITIALIZER;
 
 void DestroyConnectorOnIOThread() { g_io_thread_connector.Get().reset(); }
 
-void StartUtilityProcessOnIOThread(shell::mojom::ServiceFactoryRequest request,
-                                   const base::string16& process_name,
-                                   bool use_sandbox) {
+void StartUtilityProcessOnIOThread(
+    service_manager::mojom::ServiceFactoryRequest request,
+    const base::string16& process_name,
+    bool use_sandbox) {
   UtilityProcessHost* process_host =
       UtilityProcessHost::Create(nullptr, nullptr);
   process_host->SetName(process_name);
@@ -60,11 +61,12 @@ void StartUtilityProcessOnIOThread(shell::mojom::ServiceFactoryRequest request,
   process_host->GetRemoteInterfaces()->GetInterface(std::move(request));
 }
 
-void StartServiceInUtilityProcess(const std::string& service_name,
-                                  const base::string16& process_name,
-                                  bool use_sandbox,
-                                  shell::mojom::ServiceRequest request) {
-  shell::mojom::ServiceFactoryPtr service_factory;
+void StartServiceInUtilityProcess(
+    const std::string& service_name,
+    const base::string16& process_name,
+    bool use_sandbox,
+    service_manager::mojom::ServiceRequest request) {
+  service_manager::mojom::ServiceFactoryPtr service_factory;
   BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
                           base::Bind(&StartUtilityProcessOnIOThread,
                                      base::Passed(GetProxy(&service_factory)),
@@ -74,9 +76,11 @@ void StartServiceInUtilityProcess(const std::string& service_name,
 
 #if (ENABLE_MOJO_MEDIA_IN_GPU_PROCESS)
 
-// Request shell::mojom::ServiceFactory from GPU process host. Must be called on
+// Request service_manager::mojom::ServiceFactory from GPU process host. Must be
+// called on
 // IO thread.
-void RequestGpuServiceFactory(shell::mojom::ServiceFactoryRequest request) {
+void RequestGpuServiceFactory(
+    service_manager::mojom::ServiceFactoryRequest request) {
   GpuProcessHost* process_host =
       GpuProcessHost::Get(GpuProcessHost::GPU_PROCESS_KIND_SANDBOXED);
   if (!process_host) {
@@ -92,8 +96,8 @@ void RequestGpuServiceFactory(shell::mojom::ServiceFactoryRequest request) {
 }
 
 void StartServiceInGpuProcess(const std::string& service_name,
-                              shell::mojom::ServiceRequest request) {
-  shell::mojom::ServiceFactoryPtr service_factory;
+                              service_manager::mojom::ServiceRequest request) {
+  service_manager::mojom::ServiceFactoryPtr service_factory;
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&RequestGpuServiceFactory,
@@ -137,12 +141,12 @@ class ServiceManagerContext::InProcessServiceManagerContext
  public:
   InProcessServiceManagerContext() {}
 
-  shell::mojom::ServiceRequest Start(
+  service_manager::mojom::ServiceRequest Start(
       std::unique_ptr<BuiltinManifestProvider> manifest_provider) {
-    shell::mojom::ServicePtr embedder_service_proxy;
-    shell::mojom::ServiceRequest embedder_service_request =
+    service_manager::mojom::ServicePtr embedder_service_proxy;
+    service_manager::mojom::ServiceRequest embedder_service_request =
         mojo::GetProxy(&embedder_service_proxy);
-    shell::mojom::ServicePtrInfo embedder_service_proxy_info =
+    service_manager::mojom::ServicePtrInfo embedder_service_proxy_info =
         embedder_service_proxy.PassInterface();
     BrowserThread::GetTaskRunnerForThread(BrowserThread::IO)->PostTask(
         FROM_HERE,
@@ -165,18 +169,18 @@ class ServiceManagerContext::InProcessServiceManagerContext
 
   void StartOnIOThread(
       std::unique_ptr<BuiltinManifestProvider> manifest_provider,
-      shell::mojom::ServicePtrInfo embedder_service_proxy_info) {
+      service_manager::mojom::ServicePtrInfo embedder_service_proxy_info) {
     manifest_provider_ = std::move(manifest_provider);
 
     base::SequencedWorkerPool* blocking_pool = BrowserThread::GetBlockingPool();
-    std::unique_ptr<shell::NativeRunnerFactory> native_runner_factory(
-        new shell::InProcessNativeRunnerFactory(blocking_pool));
+    std::unique_ptr<service_manager::NativeRunnerFactory> native_runner_factory(
+        new service_manager::InProcessNativeRunnerFactory(blocking_pool));
     catalog_.reset(
         new catalog::Catalog(blocking_pool, nullptr, manifest_provider_.get()));
-    service_manager_.reset(new shell::ServiceManager(
+    service_manager_.reset(new service_manager::ServiceManager(
         std::move(native_runner_factory), catalog_->TakeService()));
 
-    shell::mojom::ServiceRequest request =
+    service_manager::mojom::ServiceRequest request =
         service_manager_->StartEmbedderService(kBrowserServiceName);
     mojo::FuseInterface(
         std::move(request), std::move(embedder_service_proxy_info));
@@ -190,16 +194,16 @@ class ServiceManagerContext::InProcessServiceManagerContext
 
   std::unique_ptr<BuiltinManifestProvider> manifest_provider_;
   std::unique_ptr<catalog::Catalog> catalog_;
-  std::unique_ptr<shell::ServiceManager> service_manager_;
+  std::unique_ptr<service_manager::ServiceManager> service_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(InProcessServiceManagerContext);
 };
 
 ServiceManagerContext::ServiceManagerContext() {
-  shell::mojom::ServiceRequest request;
-  if (shell::ShellIsRemote()) {
+  service_manager::mojom::ServiceRequest request;
+  if (service_manager::ServiceManagerIsRemote()) {
     mojo::edk::SetParentPipeHandleFromCommandLine();
-    request = shell::GetServiceRequestFromCommandLine();
+    request = service_manager::GetServiceRequestFromCommandLine();
   } else {
     std::unique_ptr<BuiltinManifestProvider> manifest_provider =
         base::MakeUnique<BuiltinManifestProvider>();
@@ -301,7 +305,7 @@ ServiceManagerContext::~ServiceManagerContext() {
 }
 
 // static
-shell::Connector* ServiceManagerContext::GetConnectorForIOThread() {
+service_manager::Connector* ServiceManagerContext::GetConnectorForIOThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   return g_io_thread_connector.Get().get();
 }