ShellConnection -> ServiceContext

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 6dea6adc9a2ad29b0e196963bfd045d51fceb16c..e23e754a88609d5604c33e037d9265811c500cee 100644
--- a/chrome/test/base/mash_browser_tests_main.cc
+++ b/chrome/test/base/mash_browser_tests_main.cc
@@ -17,7 +17,7 @@
 #include "content/public/test/test_launcher.h"
 #include "services/shell/public/cpp/connector.h"
 #include "services/shell/public/cpp/service.h"
-#include "services/shell/public/cpp/shell_connection.h"
+#include "services/shell/public/cpp/service_context.h"
 #include "services/shell/runner/common/switches.h"
 #include "services/shell/runner/host/child_process.h"
 #include "services/shell/runner/init.h"
@@ -81,7 +81,7 @@ class MashTestLauncherDelegate : public ChromeTestLauncherDelegate {
     if (!mojo_test_connector_) {
       mojo_test_connector_.reset(new MojoTestConnector);
       service_.reset(new shell::Service);
-      shell_connection_.reset(new shell::ShellConnection(
+      shell_connection_.reset(new shell::ServiceContext(
           service_.get(), mojo_test_connector_->Init()));
       ConnectToDefaultApps(shell_connection_->connector());
     }
@@ -99,7 +99,7 @@ class MashTestLauncherDelegate : public ChromeTestLauncherDelegate {
   std::unique_ptr<MashTestSuite> test_suite_;
   std::unique_ptr<MojoTestConnector> mojo_test_connector_;
   std::unique_ptr<shell::Service> service_;
-  std::unique_ptr<shell::ShellConnection> shell_connection_;
+  std::unique_ptr<shell::ServiceContext> shell_connection_;
 
   DISALLOW_COPY_AND_ASSIGN(MashTestLauncherDelegate);
 };