ShellClient -> Service

content/common/mojo/mojo_shell_connection_impl.h

Index: content/common/mojo/mojo_shell_connection_impl.h
diff --git a/content/common/mojo/mojo_shell_connection_impl.h b/content/common/mojo/mojo_shell_connection_impl.h
index b20cd0ad4cb67e410ac21fa20f9b93872646b7ec..c47961d2ee0c8fe008504563acd0fa39d7018ed5 100644
--- a/content/common/mojo/mojo_shell_connection_impl.h
+++ b/content/common/mojo/mojo_shell_connection_impl.h
@@ -12,9 +12,9 @@
 #include "content/public/common/mojo_shell_connection.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "mojo/public/cpp/system/message_pipe.h"
-#include "services/shell/public/cpp/shell_client.h"
+#include "services/shell/public/cpp/service.h"
 #include "services/shell/public/cpp/shell_connection.h"
-#include "services/shell/public/interfaces/shell_client_factory.mojom.h"
+#include "services/shell/public/interfaces/service_factory.mojom.h"
 
 namespace content {
 
@@ -22,12 +22,12 @@ class EmbeddedApplicationRunner;
 
 class MojoShellConnectionImpl
     : public MojoShellConnection,
-      public shell::ShellClient,
-      public shell::InterfaceFactory<shell::mojom::ShellClientFactory>,
-      public shell::mojom::ShellClientFactory {
+      public shell::Service,
+      public shell::InterfaceFactory<shell::mojom::ServiceFactory>,
+      public shell::mojom::ServiceFactory {
 
  public:
-  explicit MojoShellConnectionImpl(shell::mojom::ShellClientRequest request);
+  explicit MojoShellConnectionImpl(shell::mojom::ServiceRequest request);
   ~MojoShellConnectionImpl() override;
 
  private:
@@ -36,38 +36,37 @@ class MojoShellConnectionImpl
   shell::Connector* GetConnector() override;
   const shell::Identity& GetIdentity() const override;
   void SetConnectionLostClosure(const base::Closure& closure) override;
-  void AddEmbeddedShellClient(
-      std::unique_ptr<shell::ShellClient> shell_client) override;
-  void AddEmbeddedShellClient(shell::ShellClient* shell_client) override;
+  void MergeService(std::unique_ptr<shell::Service> service) override;
+  void MergeService(shell::Service* service) override;
   void AddEmbeddedService(const std::string& name,
                           const MojoApplicationInfo& info) override;
-  void AddShellClientRequestHandler(
+  void AddServiceRequestHandler(
       const std::string& name,
-      const ShellClientRequestHandler& handler) override;
+      const ServiceRequestHandler& handler) override;
 
-  // shell::ShellClient:
-  void Initialize(shell::Connector* connector,
-                  const shell::Identity& identity,
-                  uint32_t id) override;
-  bool AcceptConnection(shell::Connection* connection) override;
+  // shell::Service:
+  void OnStart(shell::Connector* connector,
+               const shell::Identity& identity,
+               uint32_t id) override;
+  bool OnConnect(shell::Connection* connection) override;
   shell::InterfaceRegistry* GetInterfaceRegistryForConnection() override;
   shell::InterfaceProvider* GetInterfaceProviderForConnection() override;
 
-  // shell::InterfaceFactory<shell::mojom::ShellClientFactory>:
+  // shell::InterfaceFactory<shell::mojom::ServiceFactory>:
   void Create(shell::Connection* connection,
-              shell::mojom::ShellClientFactoryRequest request) override;
+              shell::mojom::ServiceFactoryRequest request) override;
 
-  // shell::mojom::ShellClientFactory:
-  void CreateShellClient(shell::mojom::ShellClientRequest request,
+  // shell::mojom::ServiceFactory:
+  void CreateService(shell::mojom::ServiceRequest request,
                          const mojo::String& name) override;
 
   std::unique_ptr<shell::ShellConnection> shell_connection_;
-  mojo::BindingSet<shell::mojom::ShellClientFactory> factory_bindings_;
-  std::vector<shell::ShellClient*> embedded_shell_clients_;
-  std::vector<std::unique_ptr<shell::ShellClient>> owned_shell_clients_;
+  mojo::BindingSet<shell::mojom::ServiceFactory> factory_bindings_;
+  std::vector<shell::Service*> embedded_services_;
+  std::vector<std::unique_ptr<shell::Service>> owned_services_;
   std::unordered_map<std::string, std::unique_ptr<EmbeddedApplicationRunner>>
       embedded_apps_;
-  std::unordered_map<std::string, ShellClientRequestHandler> request_handlers_;
+  std::unordered_map<std::string, ServiceRequestHandler> request_handlers_;
 
   DISALLOW_COPY_AND_ASSIGN(MojoShellConnectionImpl);
 };