ShellClient -> Service

services/ui/test_wm/test_wm.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 "mojo/public/c/system/main.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "services/shell/public/cpp/application_runner.h"
 #include "services/shell/public/cpp/connector.h"
-#include "services/shell/public/cpp/shell_client.h"
+#include "services/shell/public/cpp/service.h"
 #include "services/ui/public/cpp/window.h"
 #include "services/ui/public/cpp/window_manager_delegate.h"
 #include "services/ui/public/cpp/window_tree_client.h"
 #include "services/ui/public/cpp/window_tree_client_delegate.h"
 #include "ui/display/display.h"
 #include "ui/display/mojo/display_type_converters.h"
 
 namespace ui {
 namespace test {
 
-class TestWM : public shell::ShellClient,
+class TestWM : public shell::Service,
                public ui::WindowTreeClientDelegate,
                public ui::WindowManagerDelegate {
  public:
   TestWM() {}
   ~TestWM() override { delete window_tree_client_; }
 
  private:
-  // shell::ShellClient:
-  void Initialize(shell::Connector* connector,
-                  const shell::Identity& identity,
-                  uint32_t id) override {
+  // shell::Service:
+  void OnStart(shell::Connector* connector,
+               const shell::Identity& identity,
+               uint32_t id) override {
     window_tree_client_ = new ui::WindowTreeClient(this, this, nullptr);
     window_tree_client_->ConnectAsWindowManager(connector);
   }
-  bool AcceptConnection(shell::Connection* connection) override {
+  bool OnConnect(shell::Connection* connection) override {
     return true;
   }
 
   // ui::WindowTreeClientDelegate:
   void OnEmbed(ui::Window* root) override {
     // WindowTreeClients configured as the window manager should never get
     // OnEmbed().
     NOTREACHED();
   }
   void OnDidDestroyClient(ui::WindowTreeClient* client) override {
@@ skipping 52 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(TestWM);
 };
 
 }  // namespace test
 }  // namespace ui
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   shell::ApplicationRunner runner(new ui::test::TestWM);
   return runner.Run(shell_handle);
 }