mus/chrome: Always wait for the mojo shell.

chrome/test/base/mojo_test_connector.cc

Index: chrome/test/base/mojo_test_connector.cc
diff --git a/chrome/test/base/mojo_test_connector.cc b/chrome/test/base/mojo_test_connector.cc
index 123db3a776c19679aee93f592f0a557491484b86..14feb6f0a8b30c6d840c58b94f0f6ed0aeed0dff 100644
--- a/chrome/test/base/mojo_test_connector.cc
+++ b/chrome/test/base/mojo_test_connector.cc
@@ -87,7 +87,6 @@ class BackgroundTestState {
                const std::string& instance,
                base::TestLauncher::LaunchOptions* test_launch_options) {
     command_line->AppendSwitch(MojoTestConnector::kTestSwitch);
-    command_line->AppendSwitch(switches::kWaitForMojoShell);
     command_line->AppendSwitch(switches::kChildProcess);
     mojo_ipc_channel_.reset(new mojo::edk::PlatformChannelPair);
     mojo_ipc_channel_->PrepareToPassClientHandleToChildProcess(
@@ -218,38 +217,18 @@ class MojoTestState : public content::TestState {
 
 }  // namespace
 
-class MojoTestConnector::NativeRunnerDelegateImpl
-    : 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")
-      command_line->AppendSwitch(switches::kWaitForMojoShell);
-  }
-
-  DISALLOW_COPY_AND_ASSIGN(NativeRunnerDelegateImpl);
-};
-
 // static
 const char MojoTestConnector::kTestSwitch[] = "is_test";
 
 MojoTestConnector::MojoTestConnector() {}
 
 shell::mojom::ShellClientRequest MojoTestConnector::Init() {
-  native_runner_delegate_.reset(new NativeRunnerDelegateImpl);
   std::unique_ptr<shell::BackgroundShell::InitParams> init_params(
       new shell::BackgroundShell::InitParams);
   init_params->catalog_store = BuildTestCatalogStore();
   // When running in single_process mode chrome initializes the edk.
   init_params->init_edk = !base::CommandLine::ForCurrentProcess()->HasSwitch(
       content::kSingleProcessTestsFlag);
-  init_params->native_runner_delegate = native_runner_delegate_.get();
   background_shell_.Init(std::move(init_params));
   return background_shell_.CreateShellClientRequest(kTestRunnerName);
 }