Rename shell namespace to service_manager

chrome/browser/chromeos/chrome_interface_factory.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/browser/chromeos/chrome_interface_factory.h"
 
 #include <memory>
 
 #include "ash/common/mojo_interface_factory.h"
 #include "ash/public/interfaces/wallpaper.mojom.h"
@@ skipping 66 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(ChromeLaunchable);
 };
 
 class FactoryImpl {
  public:
   FactoryImpl() {}
   ~FactoryImpl() {}
 
   template <typename Interface>
   static void AddFactory(
-      shell::InterfaceRegistry* registry,
+      service_manager::InterfaceRegistry* registry,
       scoped_refptr<base::SingleThreadTaskRunner> task_runner) {
     registry->AddInterface<Interface>(
         base::Bind(&FactoryImpl::CallMainThreadFactory<Interface>),
         task_runner);
   }
 
  private:
   static FactoryImpl* Get() {
     if (!factory_.Get())
       factory_.Get().reset(new FactoryImpl);
@@ skipping 53 matching lines @@
 base::LazyInstance<std::unique_ptr<FactoryImpl>>::Leaky FactoryImpl::factory_ =
     LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace
 
 ChromeInterfaceFactory::ChromeInterfaceFactory()
     : main_thread_task_runner_(base::ThreadTaskRunnerHandle::Get()) {}
 
 ChromeInterfaceFactory::~ChromeInterfaceFactory() {}
 
-bool ChromeInterfaceFactory::OnConnect(const shell::Identity& remote_identity,
-                                       shell::InterfaceRegistry* registry,
-                                       shell::Connector* connector) {
+bool ChromeInterfaceFactory::OnConnect(
+    const service_manager::Identity& remote_identity,
+    service_manager::InterfaceRegistry* registry,
+    service_manager::Connector* connector) {
   FactoryImpl::AddFactory<keyboard::mojom::Keyboard>(registry,
                                                      main_thread_task_runner_);
   FactoryImpl::AddFactory<mash::mojom::Launchable>(registry,
                                                    main_thread_task_runner_);
   FactoryImpl::AddFactory<ash::mojom::SystemTrayClient>(
       registry, main_thread_task_runner_);
   FactoryImpl::AddFactory<ash::mojom::WallpaperManager>(
       registry, main_thread_task_runner_);
   FactoryImpl::AddFactory<app_list::mojom::AppListPresenter>(
       registry, main_thread_task_runner_);
 
   // In classic ash, the browser process provides ash services to itself.
   if (!chrome::IsRunningInMash()) {
     ash::mojo_interface_factory::RegisterInterfaces(registry,
                                                     main_thread_task_runner_);
   }
 
   return true;
 }
 
 }  // namespace chromeos