Rename shell namespace to service_manager

chrome/app/mash/mash_runner.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/app/mash/mash_runner.h"
 
 #include "base/at_exit.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/debug/debugger.h"
@@ skipping 17 matching lines @@
 #include "services/service_manager/public/cpp/identity.h"
 #include "services/service_manager/public/cpp/service.h"
 #include "services/service_manager/public/cpp/service_context.h"
 #include "services/service_manager/public/interfaces/service_factory.mojom.h"
 #include "services/service_manager/runner/common/switches.h"
 #include "services/service_manager/runner/host/child_process_base.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
 #include "ui/base/ui_base_switches.h"
 
-using shell::mojom::ServiceFactory;
+using service_manager::mojom::ServiceFactory;
 
 namespace {
 
 // kProcessType used to identify child processes.
 const char* kMashChild = "mash-child";
 
 const char kChromeMashServiceName[] = "service:chrome_mash";
 
 const char kChromeMashContentBrowserPackageName[] =
     "chrome_mash_content_browser";
@@ skipping 20 matching lines @@
 void InitializeResources() {
   ui::RegisterPathProvider();
   const std::string locale =
       base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
           switches::kLang);
   // This loads the Chrome's resources (chrome_100_percent.pak etc.)
   ui::ResourceBundle::InitSharedInstanceWithLocale(
       locale, nullptr, ui::ResourceBundle::LOAD_COMMON_RESOURCES);
 }
 
-class NativeRunnerDelegateImpl : public shell::NativeRunnerDelegate {
+class NativeRunnerDelegateImpl : public service_manager::NativeRunnerDelegate {
  public:
   NativeRunnerDelegateImpl() {}
   ~NativeRunnerDelegateImpl() override {}
 
  private:
-  // shell::NativeRunnerDelegate:
+  // service_manager::NativeRunnerDelegate:
   void AdjustCommandLineArgumentsForTarget(
-      const shell::Identity& target,
+      const service_manager::Identity& target,
       base::CommandLine* command_line) override {
     if (target.name() != content::kBrowserServiceName) {
       // If running anything other than the browser process, launch a mash
       // child process. The new process will execute MashRunner::RunChild().
       command_line->AppendSwitchASCII(switches::kProcessType, kMashChild);
 #if defined(OS_WIN)
       command_line->AppendArg(switches::kPrefetchArgumentOther);
 #endif
       return;
     }
@@ skipping 22 matching lines @@
     RunChild();
   else
     RunMain();
 }
 
 void MashRunner::RunMain() {
   // TODO(sky): refactor backgroundshell so can supply own context, we
   // shouldn't we using context as it has a lot of stuff we don't really want
   // in chrome.
   NativeRunnerDelegateImpl native_runner_delegate;
-  shell::BackgroundShell background_shell;
-  std::unique_ptr<shell::BackgroundShell::InitParams> init_params(
-      new shell::BackgroundShell::InitParams);
+  service_manager::BackgroundShell background_service_manager;
+  std::unique_ptr<service_manager::BackgroundShell::InitParams> init_params(
+      new service_manager::BackgroundShell::InitParams);
   init_params->native_runner_delegate = &native_runner_delegate;
-  background_shell.Init(std::move(init_params));
+  background_service_manager.Init(std::move(init_params));
   service_.reset(new mash::MashPackagedService);
-  service_->set_context(base::MakeUnique<shell::ServiceContext>(
+  service_->set_context(base::MakeUnique<service_manager::ServiceContext>(
       service_.get(),
-      background_shell.CreateServiceRequest(kChromeMashServiceName)));
+      background_service_manager.CreateServiceRequest(kChromeMashServiceName)));
 
   // We need to send a sync messages to the Catalog, so we wait for a completed
   // connection first.
-  std::unique_ptr<shell::Connection> catalog_connection =
+  std::unique_ptr<service_manager::Connection> catalog_connection =
       service_->connector()->Connect("service:catalog");
   {
     base::RunLoop run_loop;
     catalog_connection->AddConnectionCompletedClosure(run_loop.QuitClosure());
     run_loop.Run();
   }
 
   // Synchronously override manifests needed for content process services.
   catalog::mojom::CatalogControlPtr catalog_control;
   catalog_connection->GetInterface(&catalog_control);
@@ skipping 11 matching lines @@
       GetPackageManifestPath(kChromeContentUtilityPackageName)));
 
   // Ping mash_session to ensure an instance is brought up
   service_->connector()->Connect("service:mash_session");
   base::RunLoop().Run();
 }
 
 void MashRunner::RunChild() {
   base::i18n::InitializeICU();
   InitializeResources();
-  shell::ChildProcessMainWithCallback(
+  service_manager::ChildProcessMainWithCallback(
       base::Bind(&MashRunner::StartChildApp, base::Unretained(this)));
 }
 
 void MashRunner::StartChildApp(
-    shell::mojom::ServiceRequest service_request) {
+    service_manager::mojom::ServiceRequest service_request) {
   // TODO(sad): Normally, this would be a TYPE_DEFAULT message loop. However,
   // TYPE_UI is needed for mojo:ui. But it is not known whether the child app is
   // going to be mojo:ui at this point. So always create a TYPE_UI message loop
   // for now.
   base::MessageLoop message_loop(base::MessageLoop::TYPE_UI);
   service_.reset(new mash::MashPackagedService);
-  service_->set_context(base::MakeUnique<shell::ServiceContext>(
+  service_->set_context(base::MakeUnique<service_manager::ServiceContext>(
       service_.get(), std::move(service_request)));
   base::RunLoop().Run();
 }
 
 int MashMain() {
 #if defined(OS_WIN)
   base::RouteStdioToConsole(false);
 #endif
   // TODO(sky): wire this up correctly.
   logging::LoggingSettings settings;
@@ skipping 18 matching lines @@
         tracing::GetConfigForTraceToConsole();
     base::trace_event::TraceLog::GetInstance()->SetEnabled(
         trace_config,
         base::trace_event::TraceLog::RECORDING_MODE);
   }
 
   MashRunner mash_runner;
   mash_runner.Run();
   return 0;
 }