Rename shell namespace to service_manager

content/common/service_manager/service_manager_connection_impl.h

Index: content/common/service_manager/service_manager_connection_impl.h
diff --git a/content/common/service_manager/service_manager_connection_impl.h b/content/common/service_manager/service_manager_connection_impl.h
index 18245d1aa6913efaf006ecd4ac9786a94dbece6c..23c1f85464221be8d35a2c696c6dd06a7ec0fe95 100644
--- a/content/common/service_manager/service_manager_connection_impl.h
+++ b/content/common/service_manager/service_manager_connection_impl.h
@@ -17,7 +17,7 @@
 #include "services/service_manager/public/cpp/identity.h"
 #include "services/service_manager/public/interfaces/service.mojom.h"
 
-namespace shell {
+namespace service_manager {
 class Connector;
 }
 
@@ -28,7 +28,7 @@ class EmbeddedServiceRunner;
 class ServiceManagerConnectionImpl : public ServiceManagerConnection {
  public:
   explicit ServiceManagerConnectionImpl(
-      shell::mojom::ServiceRequest request,
+      service_manager::mojom::ServiceRequest request,
       scoped_refptr<base::SequencedTaskRunner> io_task_runner);
   ~ServiceManagerConnectionImpl() override;
 
@@ -38,12 +38,12 @@ class ServiceManagerConnectionImpl : public ServiceManagerConnection {
   // ServiceManagerConnection:
   void Start() override;
   void SetInitializeHandler(const base::Closure& handler) override;
-  shell::Connector* GetConnector() override;
-  const shell::Identity& GetIdentity() const override;
+  service_manager::Connector* GetConnector() override;
+  const service_manager::Identity& GetIdentity() const override;
   void SetConnectionLostClosure(const base::Closure& closure) override;
   void SetupInterfaceRequestProxies(
-      shell::InterfaceRegistry* registry,
-      shell::InterfaceProvider* provider) override;
+      service_manager::InterfaceRegistry* registry,
+      service_manager::InterfaceProvider* provider) override;
   int AddConnectionFilter(std::unique_ptr<ConnectionFilter> filter) override;
   void RemoveConnectionFilter(int filter_id) override;
   void AddEmbeddedService(const std::string& name,
@@ -52,17 +52,17 @@ class ServiceManagerConnectionImpl : public ServiceManagerConnection {
       const std::string& name,
       const ServiceRequestHandler& handler) override;
 
-  void OnContextInitialized(const shell::Identity& identity);
+  void OnContextInitialized(const service_manager::Identity& identity);
   void OnConnectionLost();
-  void CreateService(shell::mojom::ServiceRequest request,
+  void CreateService(service_manager::mojom::ServiceRequest request,
                      const std::string& name);
-  void GetInterface(shell::mojom::InterfaceProvider* provider,
+  void GetInterface(service_manager::mojom::InterfaceProvider* provider,
                     const std::string& interface_name,
                     mojo::ScopedMessagePipeHandle request_handle);
 
-  shell::Identity identity_;
+  service_manager::Identity identity_;
 
-  std::unique_ptr<shell::Connector> connector_;
+  std::unique_ptr<service_manager::Connector> connector_;
   scoped_refptr<IOThreadContext> context_;
 
   base::Closure initialize_handler_;