Rename a bunch of Mojo Application stuff to reference Services.

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/i18n/icu_util.h"
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/process/launch.h"
 #include "base/run_loop.h"
 #include "base/sys_info.h"
 #include "base/threading/thread_task_runner_handle.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/common/service_manager_connection.h"
 #include "content/public/test/test_launcher.h"
 #include "mash/package/mash_packaged_service.h"
 #include "services/shell/public/cpp/connector.h"
 #include "services/shell/public/cpp/service.h"
 #include "services/shell/public/cpp/service_context.h"
 #include "services/shell/public/cpp/service_runner.h"
 #include "services/shell/runner/common/switches.h"
 #include "services/shell/runner/host/child_process.h"
 #include "services/shell/runner/host/child_process_base.h"
 #include "services/shell/runner/init.h"
@@ skipping 75 matching lines @@
     mojo_test_connector_.reset();
   }
 
   std::unique_ptr<MashTestSuite> test_suite_;
   std::unique_ptr<MojoTestConnector> mojo_test_connector_;
   std::unique_ptr<mash::MashPackagedService> service_;
 
   DISALLOW_COPY_AND_ASSIGN(MashTestLauncherDelegate);
 };
 
-std::unique_ptr<content::MojoShellConnection> CreateMojoShellConnection(
-    MashTestLauncherDelegate* delegate) {
-  std::unique_ptr<content::MojoShellConnection> connection(
-      content::MojoShellConnection::Create(
+std::unique_ptr<content::ServiceManagerConnection>
+    CreateServiceManagerConnection(MashTestLauncherDelegate* delegate) {
+  std::unique_ptr<content::ServiceManagerConnection> connection(
+      content::ServiceManagerConnection::Create(
           delegate->GetMojoTestConnectorForSingleProcess()->Init(),
           base::ThreadTaskRunnerHandle::Get()));
   connection->Start();
   ConnectToDefaultApps(connection->GetConnector());
   return connection;
 }
 
 void StartChildApp(shell::mojom::ServiceRequest service_request) {
   base::MessageLoop message_loop(base::MessageLoop::TYPE_DEFAULT);
   base::RunLoop run_loop;
@@ skipping 33 matching lines @@
 #if !defined(OFFICIAL_BUILD) && defined(OS_WIN)
     base::RouteStdioToConsole(false);
 #endif
     *exit_code = shell::ChildProcessMain();
     return true;
   }
 
   int default_jobs = std::max(1, base::SysInfo::NumberOfProcessors() / 2);
   MashTestLauncherDelegate delegate;
   // --single_process and no primoridal pipe token indicate we were run directly
-  // from the command line. In this case we have to start up MojoShellConnection
+  // from the command line. In this case we have to start up
+  // ServiceManagerConnection
   // as though we were embedded.
-  content::MojoShellConnection::Factory shell_connection_factory;
+  content::ServiceManagerConnection::Factory shell_connection_factory;
   if (command_line.HasSwitch(content::kSingleProcessTestsFlag) &&
       !command_line.HasSwitch(switches::kPrimordialPipeToken)) {
     shell_connection_factory =
-        base::Bind(&CreateMojoShellConnection, &delegate);
-    content::MojoShellConnection::SetFactoryForTest(&shell_connection_factory);
+        base::Bind(&CreateServiceManagerConnection, &delegate);
+    content::ServiceManagerConnection::SetFactoryForTest(
+        &shell_connection_factory);
   }
   *exit_code = LaunchChromeTests(default_jobs, &delegate, argc, argv);
   return true;
 }