Mash: Replaces "exe:chrome" with "service:content_browser"

chrome/test/base/mojo_test_connector.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 "chrome/test/base/mojo_test_connector.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
@@ skipping 17 matching lines @@
 #include "services/shell/runner/common/switches.h"
 #include "services/shell/service_manager.h"
 #include "services/shell/switches.h"
 
 using shell::mojom::Service;
 using shell::mojom::ServicePtr;
 
 namespace {
 
 const char kTestRunnerName[] = "exe:mash_browser_tests";
-const char kTestName[] = "exe:chrome";
+const char kTestName[] = "service:content_browser";
 
 // BackgroundTestState maintains all the state necessary to bind the test to
 // mojo. This class is only used on the thread created by BackgroundShell.
 class BackgroundTestState {
  public:
   BackgroundTestState() : child_token_(mojo::edk::GenerateRandomToken()) {}
   ~BackgroundTestState() {}
 
   // Prepares the command line and other setup for connecting the test to mojo.
   // Must be paired with a call to ChildProcessLaunched().
@@ skipping 15 matching lines @@
     test_launch_options->fds_to_remap = &handle_passing_info_;
 #else
 #error "Unsupported"
 #endif
     shell::mojom::ServicePtr service =
         shell::PassServiceRequestOnCommandLine(command_line, child_token_);
 
     std::unique_ptr<shell::ConnectParams> params(new shell::ConnectParams);
     params->set_source(shell::CreateServiceManagerIdentity());
     // Use the default instance name (which should be "browser"). Otherwise a
-    // service (e.g. ash) that connects to the default "exe:chrome" will spawn
-    // a new instance.
+    // service (e.g. ash) that connects to the default "service:content_browser"
+    // will spawn a new instance.
     params->set_target(shell::Identity(kTestName, shell::mojom::kRootUserID));
 
     shell::mojom::ClientProcessConnectionPtr client_process_connection =
         shell::mojom::ClientProcessConnection::New();
     client_process_connection->service =
         service.PassInterface().PassHandle();
     client_process_connection->pid_receiver_request =
         mojo::GetProxy(&pid_receiver_).PassMessagePipe();
     params->set_client_process_connection(std::move(client_process_connection));
     service_manager->Connect(std::move(params));
@@ skipping 116 matching lines @@
     : public shell::NativeRunnerDelegate {
  public:
   NativeRunnerDelegateImpl() {}
   ~NativeRunnerDelegateImpl() override {}
 
  private:
   // shell::NativeRunnerDelegate:
   void AdjustCommandLineArgumentsForTarget(
       const shell::Identity& target,
       base::CommandLine* command_line) override {
-    if (target.name() != "exe:chrome") {
-      if (target.name() == "exe:mash_browser_tests")
+    if (target.name() != kTestName) {
+      if (target.name() == kTestRunnerName)
         RemoveMashFromBrowserTests(command_line);
       command_line->AppendSwitch(MojoTestConnector::kMashApp);
       return;
     }
 
     base::CommandLine::StringVector argv(command_line->argv());
     auto iter =
         std::find(argv.begin(), argv.end(), FILE_PATH_LITERAL("--run-in-mash"));
     if (iter != argv.end())
       argv.erase(iter);
@@ skipping 26 matching lines @@
 MojoTestConnector::~MojoTestConnector() {}
 
 std::unique_ptr<content::TestState> MojoTestConnector::PrepareForTest(
     base::CommandLine* command_line,
     base::TestLauncher::LaunchOptions* test_launch_options) {
   std::unique_ptr<MojoTestState> test_state(
       new MojoTestState(&background_shell_));
   test_state->Init(command_line, test_launch_options);
   return std::move(test_state);
 }