One BackgroundServerManager per MojoTestState

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/debug/stack_trace.h"
@@ skipping 91 matching lines @@
   }
 
   std::unique_ptr<content::TestState> PreRunTest(
       base::CommandLine* command_line,
       base::TestLauncher::LaunchOptions* test_launch_options) override {
     if (!mojo_test_connector_) {
       mojo_test_connector_ =
           base::MakeUnique<MojoTestConnector>(ReadCatalogManifest(), config_);
       mojo_test_connector_->Init();
     }
-    return mojo_test_connector_->PrepareForTest(
-        command_line, test_launch_options,
-        base::BindOnce(&MashTestLauncherDelegate::OnTestProcessLaunched,
-                       base::Unretained(this)));
-  }
-
-  void OnTestProcessLaunched() {
-    // Start default apps after chrome, as they may try to connect to chrome on
-    // startup. Attempt to connect once per test in case a previous test crashed
-    // mash_session.
-    mojo_test_connector_->StartService(mash::session::mojom::kServiceName);
+    return mojo_test_connector_->PrepareForTest(command_line,
+                                                test_launch_options);
   }
 
   void OnDoneRunningTests() override {
     // We have to shutdown this state here, while an AtExitManager is still
     // valid.
     mojo_test_connector_.reset();
   }
 
   std::unique_ptr<base::Value> ReadCatalogManifest() {
     std::string catalog_contents;
@@ skipping 80 matching lines @@
   if (command_line->HasSwitch(content::kSingleProcessTestsFlag) &&
       !command_line->HasSwitch(service_manager::switches::kServicePipeToken)) {
     service_manager_connection_factory =
         base::Bind(&CreateServiceManagerConnection, &delegate);
     content::ServiceManagerConnection::SetFactoryForTest(
         &service_manager_connection_factory);
   }
   *exit_code = LaunchChromeTests(default_jobs, &delegate, argc, argv);
   return true;
 }