ShellClient -> Service

chrome/test/base/mash_browser_tests_main.cc

Index: chrome/test/base/mash_browser_tests_main.cc
diff --git a/chrome/test/base/mash_browser_tests_main.cc b/chrome/test/base/mash_browser_tests_main.cc
index eeffe524790fdc53d9afc59a42447e1bc3a64207..6dea6adc9a2ad29b0e196963bfd045d51fceb16c 100644
--- a/chrome/test/base/mash_browser_tests_main.cc
+++ b/chrome/test/base/mash_browser_tests_main.cc
@@ -16,7 +16,7 @@
 #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"
@@ -80,9 +80,9 @@ class MashTestLauncherDelegate : public ChromeTestLauncherDelegate {
       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,
@@ -92,13 +92,13 @@ class MashTestLauncherDelegate : public ChromeTestLauncherDelegate {
     // 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);