Have mash_browser_tests recreate BackgroundServiceManager per test

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 7ff38d4fd633e3d6b355ee7db7ec34899f622635..13f5c6a3ab6dbe09d61cd5f4705ea5fc3463054d 100644
--- a/chrome/test/base/mash_browser_tests_main.cc
+++ b/chrome/test/base/mash_browser_tests_main.cc
@@ -115,6 +115,14 @@ class MashTestLauncherDelegate : public ChromeTestLauncherDelegate {
                        base::Unretained(this)));
   }
 
+  bool AdjustChildProcessCommandLine(
+      base::CommandLine* command_line,
+      const base::FilePath& temp_data_dir) override {
+    bool result = ChromeTestLauncherDelegate::AdjustChildProcessCommandLine(

[sky, 2017/05/12 17:16:47]

It doesn't seem that this override is necessary. Can it be removed?

[jonross, 2017/05/12 18:08:02]

Whoops, missed this when I was removing my debugging. Will remove

[jonross, 2017/05/16 21:54:45]

Done.

+        command_line, temp_data_dir);
+    return result;
+  }
+
   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
@@ -153,9 +161,11 @@ class MashTestLauncherDelegate : public ChromeTestLauncherDelegate {
 
 std::unique_ptr<content::ServiceManagerConnection>
     CreateServiceManagerConnection(MashTestLauncherDelegate* delegate) {
+  delegate->GetMojoTestConnectorForSingleProcess()->Init();
   std::unique_ptr<content::ServiceManagerConnection> connection(
       content::ServiceManagerConnection::Create(
-          delegate->GetMojoTestConnectorForSingleProcess()->Init(),
+          delegate->GetMojoTestConnectorForSingleProcess()
+              ->InitBackgroundServiceManager(),
           base::ThreadTaskRunnerHandle::Get()));
   connection->Start();
   connection->GetConnector()->StartService(mash::session::mojom::kServiceName);