Fix Mash Browser Test Startup Race

chrome/test/base/mojo_test_connector.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 "chrome/test/base/mojo_test_connector.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
@@ skipping 170 matching lines @@
 
 // static
 const char MojoTestConnector::kTestSwitch[] = "is_test";
 // static
 const char MojoTestConnector::kMashApp[] = "mash-app";
 
 MojoTestConnector::MojoTestConnector(
     std::unique_ptr<base::Value> catalog_contents)
     : service_process_launcher_delegate_(
           new ServiceProcessLauncherDelegateImpl),
-      background_service_manager_(service_process_launcher_delegate_.get(),
-                                  std::move(catalog_contents)) {}
+      background_service_manager_(nullptr),
+      catalog_contents_(std::move(catalog_contents)) {}
 
 service_manager::mojom::ServiceRequest MojoTestConnector::Init() {
   // In single-process test mode, browser code will initialize the EDK and IPC.
   // Otherwise we ensure it's initialized here.
   if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
           content::kSingleProcessTestsFlag)) {
     mojo::edk::Init();
     ipc_thread_ = base::MakeUnique<base::Thread>("IPC thread");
     ipc_thread_->StartWithOptions(base::Thread::Options(
         base::MessageLoop::TYPE_IO, 0));
     ipc_support_ = base::MakeUnique<mojo::edk::ScopedIPCSupport>(
         ipc_thread_->task_runner(),
         mojo::edk::ScopedIPCSupport::ShutdownPolicy::FAST);
   }
 
   service_manager::mojom::ServicePtr service;
   service_manager::mojom::ServiceRequest request(&service);
-  background_service_manager_.RegisterService(
+
+  // BackgroundServiceManager must be created after mojo::edk::Init() as it
+  // attempts to create mojo pipes for the provided catalog on a separate
+  // thread.
+  background_service_manager_ =
+      base::MakeUnique<service_manager::BackgroundServiceManager>(
+          service_process_launcher_delegate_.get(),
+          std::move(catalog_contents_));
+  background_service_manager_->RegisterService(
       service_manager::Identity(kTestRunnerName,
                                 service_manager::mojom::kRootUserID),
       std::move(service), nullptr);
   return request;
 }
 
 MojoTestConnector::~MojoTestConnector() {}
 
 std::unique_ptr<content::TestState> MojoTestConnector::PrepareForTest(
     base::CommandLine* command_line,
     base::TestLauncher::LaunchOptions* test_launch_options) {
   auto test_state =
-      base::MakeUnique<MojoTestState>(&background_service_manager_);
+      base::MakeUnique<MojoTestState>(background_service_manager_.get());
   test_state->Init(command_line, test_launch_options);
   return test_state;
 }