One BackgroundServerManager per MojoTestState

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 e5e68a0abbee5b951f20074b905287c064264511..dbdeaf1070f5acaed67a59805752bff01e94f96e 100644
--- a/chrome/test/base/mash_browser_tests_main.cc
+++ b/chrome/test/base/mash_browser_tests_main.cc
@@ -109,17 +109,8 @@ class MashTestLauncherDelegate : public ChromeTestLauncherDelegate {
           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 {