Fix Mash Browser Test Startup Race

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 cd7839c319012a81327ce96e85b89ebe8115cc5f..abaf89ce5acba8c5d1bd7b4763232142ed9f8624 100644
--- a/chrome/test/base/mojo_test_connector.h
+++ b/chrome/test/base/mojo_test_connector.h
@@ -57,11 +57,14 @@ class MojoTestConnector {
 
   std::unique_ptr<ServiceProcessLauncherDelegateImpl>
       service_process_launcher_delegate_;
-  service_manager::BackgroundServiceManager background_service_manager_;
+  std::unique_ptr<service_manager::BackgroundServiceManager>
+      background_service_manager_;
 
   std::unique_ptr<base::Thread> ipc_thread_;
   std::unique_ptr<mojo::edk::ScopedIPCSupport> ipc_support_;
 
+  std::unique_ptr<base::Value> catalog_contents_;
+
   DISALLOW_COPY_AND_ASSIGN(MojoTestConnector);
 };