One BackgroundServerManager per MojoTestState

chrome/test/base/mojo_test_connector.h

Index: chrome/test/base/mojo_test_connector.h
diff --git a/chrome/test/base/mojo_test_connector.h b/chrome/test/base/mojo_test_connector.h
index fbeb11cef98b26fa67c094699fecf86e48d7566b..cf5f6b8835fe7749b390ce25f9699cd8e3a1776a 100644
--- a/chrome/test/base/mojo_test_connector.h
+++ b/chrome/test/base/mojo_test_connector.h
@@ -67,10 +67,12 @@ class MojoTestConnector {
   // Initializes the background thread the ServiceManager runs on.
   service_manager::mojom::ServiceRequest InitBackgroundServiceManager();
 
+  std::unique_ptr<service_manager::BackgroundServiceManager>
+  CreateBackgroundServiceManager(service_manager::mojom::ServicePtr service);
+
   std::unique_ptr<content::TestState> PrepareForTest(
       base::CommandLine* command_line,
-      base::TestLauncher::LaunchOptions* test_launch_options,
-      base::OnceClosure on_process_launched);
+      base::TestLauncher::LaunchOptions* test_launch_options);
 
   void StartService(const std::string& service_name);