[Service Manager] Get rid of dynamic service discovery

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 952df7f27f34beb63c7c1d66a2d6e1e89542a4c8..cd7839c319012a81327ce96e85b89ebe8115cc5f 100644
--- a/chrome/test/base/mojo_test_connector.h
+++ b/chrome/test/base/mojo_test_connector.h
@@ -15,13 +15,21 @@
 
 namespace base {
 class CommandLine;
+class Thread;
+class Value;
+}
+
+namespace mojo {
+namespace edk {
+class ScopedIPCSupport;
+}
 }
 
 namespace content {
 class TestState;
 }
 
-// MojoTestConnector in responsible for providing the necessary wiring for
+// MojoTestConnector is responsible for providing the necessary wiring for
 // test processes to get a mojo channel passed to them.  To use this class
 // call PrepareForTest() prior to launching each test. It is expected
 // PrepareForTest() is called from content::TestLauncherDelegate::PreRunTest().
@@ -34,7 +42,7 @@ class MojoTestConnector {
   // browser_tests.
   static const char kMashApp[];
 
-  MojoTestConnector();
+  explicit MojoTestConnector(std::unique_ptr<base::Value> catalog_contents);
   ~MojoTestConnector();
 
   // Initializes the background thread the ServiceManager runs on.
@@ -49,9 +57,11 @@ class MojoTestConnector {
 
   std::unique_ptr<ServiceProcessLauncherDelegateImpl>
       service_process_launcher_delegate_;
-
   service_manager::BackgroundServiceManager background_service_manager_;
 
+  std::unique_ptr<base::Thread> ipc_thread_;
+  std::unique_ptr<mojo::edk::ScopedIPCSupport> ipc_support_;
+
   DISALLOW_COPY_AND_ASSIGN(MojoTestConnector);
 };