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

services/service_manager/public/cpp/service_test.h

 // 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.
 
 #ifndef SERVICES_SERVICE_MANAGER_PUBLIC_CPP_SERVICE_TEST_H_
 #define SERVICES_SERVICE_MANAGER_PUBLIC_CPP_SERVICE_TEST_H_
 
 #include <memory>
 
 #include "base/macros.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "services/service_manager/public/cpp/service.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace base {
 class MessageLoop;
-class Thread;
-}
-
-namespace mojo {
-namespace edk {
-class ScopedIPCSupport;
-}
 }
 
 namespace service_manager {
 
 class BackgroundServiceManager;
 class ServiceContext;
 
 namespace test {
 
 class ServiceTest;
@@ skipping 18 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(ServiceTestClient);
 };
 
 class ServiceTest : public testing::Test {
  public:
   ServiceTest();
   // Initialize passing the name to use as the identity for the test itself.
   // 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:
   // See constructor. Can only be called once.
   void InitTestName(const std::string& test_name);
 
   Connector* connector() { return connector_; }
 
   // Instance information received from the Service Manager during OnStart().
   const std::string& test_name() const { return initialize_name_; }
@@ skipping 20 matching lines @@
  private:
   friend ServiceTestClient;
 
   std::unique_ptr<ServiceContext> context_;
   std::unique_ptr<base::MessageLoop> message_loop_;
   std::unique_ptr<BackgroundServiceManager> background_service_manager_;
 
   // 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_;
   std::string initialize_userid_ = service_manager::mojom::kInheritUserID;
   uint32_t initialize_instance_id_ = service_manager::mojom::kInvalidInstanceID;
 
   base::Closure initialize_called_;
 
   DISALLOW_COPY_AND_ASSIGN(ServiceTest);
 };
 
 }  // namespace test
 }  // namespace service_manager
 
 #endif  // SERVICES_SERVICE_MANAGER_PUBLIC_CPP_SERVICE_TEST_H_