ShellClient -> Service

chrome/test/base/mash_browser_tests_main.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 <algorithm>
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/debug/debugger.h"
 #include "base/memory/ptr_util.h"
 #include "base/process/launch.h"
 #include "base/sys_info.h"
 #include "chrome/test/base/chrome_test_launcher.h"
 #include "chrome/test/base/chrome_test_suite.h"
 #include "chrome/test/base/mojo_test_connector.h"
 #include "content/public/common/mojo_shell_connection.h"
 #include "content/public/test/test_launcher.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/shell/public/cpp/shell_connection.h"
 #include "services/shell/runner/common/switches.h"
 #include "services/shell/runner/host/child_process.h"
 #include "services/shell/runner/init.h"
 
 namespace {
 
 void ConnectToDefaultApps(shell::Connector* connector) {
   connector->Connect("mojo:mash_session");
 }
@@ skipping 43 matching lines @@
     test_suite_.reset(new MashTestSuite(argc, argv));
     const int result = test_suite_->Run();
     test_suite_.reset();
     return result;
   }
   std::unique_ptr<content::TestState> PreRunTest(
       base::CommandLine* command_line,
       base::TestLauncher::LaunchOptions* test_launch_options) override {
     if (!mojo_test_connector_) {
       mojo_test_connector_.reset(new MojoTestConnector);
-      shell_client_.reset(new shell::ShellClient);
+      service_.reset(new shell::Service);
       shell_connection_.reset(new shell::ShellConnection(
-          shell_client_.get(), mojo_test_connector_->Init()));
+          service_.get(), mojo_test_connector_->Init()));
       ConnectToDefaultApps(shell_connection_->connector());
     }
     return mojo_test_connector_->PrepareForTest(command_line,
                                                 test_launch_options);
   }
   void OnDoneRunningTests() override {
     // We have to shutdown this state here, while an AtExitManager is still
     // valid.
     shell_connection_.reset();
-    shell_client_.reset();
+    service_.reset();
     mojo_test_connector_.reset();
   }
 
   std::unique_ptr<MashTestSuite> test_suite_;
   std::unique_ptr<MojoTestConnector> mojo_test_connector_;
-  std::unique_ptr<shell::ShellClient> shell_client_;
+  std::unique_ptr<shell::Service> service_;
   std::unique_ptr<shell::ShellConnection> shell_connection_;
 
   DISALLOW_COPY_AND_ASSIGN(MashTestLauncherDelegate);
 };
 
 std::unique_ptr<content::MojoShellConnection> CreateMojoShellConnection(
     MashTestLauncherDelegate* delegate) {
   std::unique_ptr<content::MojoShellConnection> connection(
       content::MojoShellConnection::Create(
           delegate->GetMojoTestConnectorForSingleProcess()->Init()));
@@ skipping 36 matching lines @@
       !command_line.HasSwitch(switches::kPrimordialPipeToken)) {
     shell_connection_factory =
         base::Bind(&CreateMojoShellConnection, &delegate);
     content::MojoShellConnection::SetFactoryForTest(&shell_connection_factory);
   }
   *exit_code = LaunchChromeTests(default_jobs, &delegate, argc, argv);
   // TODO(sky): nuke once resolve why test isn't shutting down: 594600.
   LOG(ERROR) << "RunMashBrowserTests exit_code=" << *exit_code;
   return true;
 }