ShellClient -> Service

services/shell/tests/connect/connect_test_class_app.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 "base/bind.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "mojo/public/c/system/main.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "services/shell/public/cpp/application_runner.h"
 #include "services/shell/public/cpp/connector.h"
 #include "services/shell/public/cpp/interface_factory.h"
-#include "services/shell/public/cpp/shell_client.h"
+#include "services/shell/public/cpp/service.h"
 #include "services/shell/public/interfaces/connector.mojom.h"
 #include "services/shell/tests/connect/connect_test.mojom.h"
 
 namespace shell {
 
 using GetTitleCallback = test::mojom::ConnectTestService::GetTitleCallback;
 
 class ConnectTestClassApp
-    : public ShellClient,
+    : public Service,
       public InterfaceFactory<test::mojom::ConnectTestService>,
       public InterfaceFactory<test::mojom::ClassInterface>,
       public test::mojom::ConnectTestService,
       public test::mojom::ClassInterface {
  public:
   ConnectTestClassApp() {}
   ~ConnectTestClassApp() override {}
 
  private:
-  // shell::ShellClient:
-  void Initialize(Connector* connector, const Identity& identity,
-                  uint32_t id) override {
+  // shell::Service:
+  void OnStart(Connector* connector, const Identity& identity,
+               uint32_t id) override {
     connector_ = connector;
     identity_ = identity;
   }
-  bool AcceptConnection(Connection* connection) override {
+  bool OnConnect(Connection* connection) override {
     connection->AddInterface<test::mojom::ConnectTestService>(this);
     connection->AddInterface<test::mojom::ClassInterface>(this);
     inbound_connections_.insert(connection);
     connection->SetConnectionLostClosure(
         base::Bind(&ConnectTestClassApp::OnConnectionError,
                    base::Unretained(this), connection));
     return true;
   }
 
   // InterfaceFactory<test::mojom::ConnectTestService>:
@@ skipping 39 matching lines @@
 };
 
 }  // namespace shell
 
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   MojoResult rv = shell::ApplicationRunner(new shell::ConnectTestClassApp)
                       .Run(shell_handle);
   return rv;
 }