Revert of [Service Manager] Get rid of dynamic service discovery

services/service_manager/public/cpp/service_test.h

Index: services/service_manager/public/cpp/service_test.h
diff --git a/services/service_manager/public/cpp/service_test.h b/services/service_manager/public/cpp/service_test.h
index 1ee7b9a9dca5bed80ec000fd43c042d7eb5eb184..d4666348688c6f9032b624e37e449ebbe94c2139 100644
--- a/services/service_manager/public/cpp/service_test.h
+++ b/services/service_manager/public/cpp/service_test.h
@@ -14,13 +14,6 @@
 
 namespace base {
 class MessageLoop;
-class Thread;
-}
-
-namespace mojo {
-namespace edk {
-class ScopedIPCSupport;
-}
 }
 
 namespace service_manager {
@@ -59,7 +52,7 @@
   // Once set via this constructor, it cannot be changed later by calling
   // InitTestName(). The test executable must provide a manifest in the
   // appropriate location that specifies this name also.
-  explicit ServiceTest(const std::string& test_name, bool init_edk = false);
+  explicit ServiceTest(const std::string& test_name, bool init_edk = true);
   ~ServiceTest() override;
 
  protected:
@@ -100,8 +93,6 @@
   // See constructor.
   std::string test_name_;
   bool init_edk_ = true;
-  std::unique_ptr<base::Thread> ipc_thread_;
-  std::unique_ptr<mojo::edk::ScopedIPCSupport> ipc_support_;
 
   Connector* connector_ = nullptr;
   std::string initialize_name_;