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

ui/views/mus/views_mus_test_suite.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 "ui/views/mus/views_mus_test_suite.h"
 
 #include <memory>
 #include <string>
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/simple_thread.h"
 #include "base/threading/thread.h"
-#include "mojo/edk/embedder/embedder.h"
-#include "mojo/edk/embedder/scoped_ipc_support.h"
-#include "services/catalog/catalog.h"
 #include "services/service_manager/background/background_service_manager.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "services/service_manager/public/cpp/service.h"
 #include "services/service_manager/public/cpp/service_context.h"
 #include "services/ui/common/switches.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/aura/mus/window_tree_host_mus.h"
 #include "ui/aura/test/env_test_helper.h"
 #include "ui/aura/window.h"
 #include "ui/gl/gl_switches.h"
 #include "ui/views/mus/desktop_window_tree_host_mus.h"
 #include "ui/views/mus/mus_client.h"
 #include "ui/views/mus/test_utils.h"
 #include "ui/views/test/platform_test_helper.h"
 #include "ui/views/test/views_test_helper_aura.h"
 #include "ui/views/views_delegate.h"
 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
 
 namespace views {
 namespace {
 
-const base::FilePath::CharType kCatalogFilename[] =
-    FILE_PATH_LITERAL("views_mus_tests_catalog.json");
-
 void EnsureCommandLineSwitch(const std::string& name) {
   base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
   if (!cmd_line->HasSwitch(name))
     cmd_line->AppendSwitch(name);
 }
 
 class DefaultService : public service_manager::Service {
  public:
   DefaultService() {}
   ~DefaultService() override {}
@@ skipping 44 matching lines @@
     const service_manager::Identity& identity,
     const base::Callback<service_manager::Connector*(void)>& callback) {
   return base::MakeUnique<PlatformTestHelperMus>(callback.Run(), identity);
 }
 
 }  // namespace
 
 class ServiceManagerConnection {
  public:
   ServiceManagerConnection()
-      : thread_("Persistent service_manager connections"),
-        ipc_thread_("IPC thread") {
-    catalog::Catalog::LoadDefaultCatalogManifest(
-        base::FilePath(kCatalogFilename));
-    mojo::edk::Init();
-    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::CLEAN);
-
+      : thread_("Persistent service_manager connections") {
     base::WaitableEvent wait(base::WaitableEvent::ResetPolicy::AUTOMATIC,
                              base::WaitableEvent::InitialState::NOT_SIGNALED);
     base::Thread::Options options;
     thread_.StartWithOptions(options);
     thread_.task_runner()->PostTask(
         FROM_HERE, base::Bind(&ServiceManagerConnection::SetUpConnections,
                               base::Unretained(this), &wait));
     wait.Wait();
 
     // WindowManagerConnection cannot be created from here yet, although the
@@ skipping 29 matching lines @@
     return service_manager_connector_.get();
   }
 
   void CloneConnector(base::WaitableEvent* wait) {
     service_manager_connector_ = context_->connector()->Clone();
     wait->Signal();
   }
 
   void SetUpConnections(base::WaitableEvent* wait) {
     background_service_manager_ =
-        base::MakeUnique<service_manager::BackgroundServiceManager>(
-            nullptr, nullptr);
-    service_manager::mojom::ServicePtr service;
+        base::MakeUnique<service_manager::BackgroundServiceManager>();
+    background_service_manager_->Init(nullptr);
     context_ = base::MakeUnique<service_manager::ServiceContext>(
         base::MakeUnique<DefaultService>(),
-        service_manager::mojom::ServiceRequest(&service));
-    background_service_manager_->RegisterService(
-        service_manager::Identity(
-            GetTestName(), service_manager::mojom::kRootUserID),
-        std::move(service), nullptr);
+        background_service_manager_->CreateServiceRequest(GetTestName()));
 
     // ui/views/mus requires a WindowManager running, so launch test_wm.
     service_manager::Connector* connector = context_->connector();
     connector->Connect("test_wm");
     service_manager_connector_ = connector->Clone();
     service_manager_identity_ = context_->identity();
     wait->Signal();
   }
 
   void TearDownConnections(base::WaitableEvent* wait) {
     context_.reset();
     wait->Signal();
   }
 
   // Returns the name of the test executable, e.g.
   // "views_mus_unittests".
   std::string GetTestName() {
     base::FilePath executable = base::CommandLine::ForCurrentProcess()
                                     ->GetProgram()
                                     .BaseName()
                                     .RemoveExtension();
     return std::string("") + executable.MaybeAsASCII();
   }
 
   base::Thread thread_;
-  base::Thread ipc_thread_;
-  std::unique_ptr<mojo::edk::ScopedIPCSupport> ipc_support_;
   std::unique_ptr<service_manager::BackgroundServiceManager>
       background_service_manager_;
   std::unique_ptr<service_manager::ServiceContext> context_;
   std::unique_ptr<service_manager::Connector> service_manager_connector_;
   service_manager::Identity service_manager_identity_;
 
   DISALLOW_COPY_AND_ASSIGN(ServiceManagerConnection);
 };
 
 ViewsMusTestSuite::ViewsMusTestSuite(int argc, char** argv)
@@ skipping 13 matching lines @@
   ViewsTestSuite::Initialize();
   service_manager_connections_ = base::MakeUnique<ServiceManagerConnection>();
 }
 
 void ViewsMusTestSuite::Shutdown() {
   service_manager_connections_.reset();
   ViewsTestSuite::Shutdown();
 }
 
 }  // namespace views