Have mash_browser_tests recreate BackgroundServiceManager per test

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 97 matching lines @@
       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)));
   }
 
+  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
     // mash_session.
     mojo_test_connector_->StartService(mash::session::mojom::kServiceName);
   }
 
   void OnDoneRunningTests() override {
     // We have to shutdown this state here, while an AtExitManager is still
     // valid.
@@ skipping 18 matching lines @@
   MojoTestConnector::Config config_;
 
   std::unique_ptr<MashTestSuite> test_suite_;
   std::unique_ptr<MojoTestConnector> mojo_test_connector_;
 
   DISALLOW_COPY_AND_ASSIGN(MashTestLauncherDelegate);
 };
 
 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);
   return connection;
 }
 
 void StartEmbeddedService(service_manager::mojom::ServiceRequest request) {
   // The UI service requires this to be TYPE_UI, so we just always use TYPE_UI
   // for now.
   base::MessageLoop message_loop(base::MessageLoop::TYPE_UI);
@@ skipping 42 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;
 }