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

chrome/test/base/mash_browser_tests_main.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 <algorithm>
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/debug/debugger.h"
 #include "base/debug/stack_trace.h"
-#include "base/files/file_path.h"
-#include "base/files/file_util.h"
 #include "base/i18n/icu_util.h"
-#include "base/json/json_reader.h"
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
-#include "base/path_service.h"
 #include "base/process/launch.h"
 #include "base/run_loop.h"
 #include "base/sys_info.h"
 #include "base/threading/thread_task_runner_handle.h"
-#include "base/values.h"
 #include "chrome/test/base/chrome_test_launcher.h"
 #include "chrome/test/base/chrome_test_suite.h"
 #include "chrome/test/base/mojo_test_connector.h"
 #include "content/public/app/content_main.h"
 #include "content/public/common/service_manager_connection.h"
 #include "content/public/test/test_launcher.h"
 #include "mash/package/mash_packaged_service.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/service_manager/public/cpp/service_runner.h"
 #include "services/service_manager/public/cpp/standalone_service/standalone_service.h"
 #include "services/service_manager/runner/common/switches.h"
 #include "services/service_manager/runner/init.h"
 #include "ui/aura/env.h"
 
 namespace {
 
-const base::FilePath::CharType kCatalogFilename[] =
-    FILE_PATH_LITERAL("mash_browser_tests_catalog.json");
-
 void ConnectToDefaultApps(service_manager::Connector* connector) {
   connector->Connect("mash_session");
 }
 
 class MashTestSuite : public ChromeTestSuite {
  public:
   MashTestSuite(int argc, char** argv) : ChromeTestSuite(argc, argv) {}
 
   void SetMojoTestConnector(std::unique_ptr<MojoTestConnector> connector) {
     mojo_test_connector_ = std::move(connector);
   }
-
   MojoTestConnector* mojo_test_connector() {
     return mojo_test_connector_.get();
   }
 
  private:
   // ChromeTestSuite:
   void Shutdown() override {
     mojo_test_connector_.reset();
     ChromeTestSuite::Shutdown();
   }
 
   std::unique_ptr<MojoTestConnector> mojo_test_connector_;
 
   DISALLOW_COPY_AND_ASSIGN(MashTestSuite);
 };
 
 // Used to setup the command line for passing a mojo channel to tests.
 class MashTestLauncherDelegate : public ChromeTestLauncherDelegate {
  public:
   MashTestLauncherDelegate() : ChromeTestLauncherDelegate(nullptr) {}
   ~MashTestLauncherDelegate() override {}
 
   MojoTestConnector* GetMojoTestConnectorForSingleProcess() {
     // This is only called for single process tests, in which case we need
     // the TestSuite to own the MojoTestConnector.
     DCHECK(base::CommandLine::ForCurrentProcess()->HasSwitch(
         content::kSingleProcessTestsFlag));
     DCHECK(test_suite_);
-    test_suite_->SetMojoTestConnector(
-        base::MakeUnique<MojoTestConnector>(ReadCatalogManifest()));
+    test_suite_->SetMojoTestConnector(base::WrapUnique(new MojoTestConnector));
     return test_suite_->mojo_test_connector();
   }
 
  private:
   // ChromeTestLauncherDelegate:
   int RunTestSuite(int argc, char** argv) override {
     test_suite_.reset(new MashTestSuite(argc, argv));
     content::GetContentMainParams()->env_mode = aura::Env::Mode::MUS;
     const int result = test_suite_->Run();
     test_suite_.reset();
     return result;
   }
 
   std::unique_ptr<content::TestState> PreRunTest(
       base::CommandLine* command_line,
       base::TestLauncher::LaunchOptions* test_launch_options) override {
     if (!mojo_test_connector_) {
-      mojo_test_connector_ =
-          base::MakeUnique<MojoTestConnector>(ReadCatalogManifest());
+      mojo_test_connector_ = base::MakeUnique<MojoTestConnector>();
       context_.reset(new service_manager::ServiceContext(
           base::MakeUnique<mash::MashPackagedService>(),
           mojo_test_connector_->Init()));
     }
     std::unique_ptr<content::TestState> test_state =
         mojo_test_connector_->PrepareForTest(command_line, test_launch_options);
-
     // Start default apps after chrome, as they may try to connect to chrome on
     // startup. Attempt to connect once per test in case a previous test crashed
     // mash_session.
     ConnectToDefaultApps(context_->connector());
     return test_state;
   }
 
   void OnDoneRunningTests() override {
     // We have to shutdown this state here, while an AtExitManager is still
     // valid.
     context_.reset();
     mojo_test_connector_.reset();
   }
 
-  std::unique_ptr<base::Value> ReadCatalogManifest() {
-    std::string catalog_contents;
-    base::FilePath exe_path;
-    base::PathService::Get(base::DIR_EXE, &exe_path);
-    base::FilePath catalog_path = exe_path.Append(kCatalogFilename);
-    bool result = base::ReadFileToString(catalog_path, &catalog_contents);
-    DCHECK(result);
-    std::unique_ptr<base::Value> manifest_value =
-        base::JSONReader::Read(catalog_contents);
-    DCHECK(manifest_value);
-    return manifest_value;
-  }
-
   std::unique_ptr<MashTestSuite> test_suite_;
   std::unique_ptr<MojoTestConnector> mojo_test_connector_;
   std::unique_ptr<service_manager::ServiceContext> context_;
 
   DISALLOW_COPY_AND_ASSIGN(MashTestLauncherDelegate);
 };
 
 std::unique_ptr<content::ServiceManagerConnection>
     CreateServiceManagerConnection(MashTestLauncherDelegate* delegate) {
   std::unique_ptr<content::ServiceManagerConnection> connection(
       content::ServiceManagerConnection::Create(
           delegate->GetMojoTestConnectorForSingleProcess()->Init(),
           base::ThreadTaskRunnerHandle::Get()));
   connection->Start();
   ConnectToDefaultApps(connection->GetConnector());
   return connection;
 }
 
 void StartChildApp(service_manager::mojom::ServiceRequest service_request) {
-  // The UI service requires this to be TYPE_UI. We don't know which service
-  // we're going to run yet, so we just always use TYPE_UI for now.
-  base::MessageLoop message_loop(base::MessageLoop::TYPE_UI);
+  base::MessageLoop message_loop(base::MessageLoop::TYPE_DEFAULT);
   base::RunLoop run_loop;
   service_manager::ServiceContext context(
       base::MakeUnique<mash::MashPackagedService>(),
       std::move(service_request));
   context.SetConnectionLostClosure(run_loop.QuitClosure());
   run_loop.Run();
 }
 
 }  // namespace
 
@@ skipping 29 matching lines @@
   if (command_line.HasSwitch(content::kSingleProcessTestsFlag) &&
       !command_line.HasSwitch(switches::kPrimordialPipeToken)) {
     service_manager_connection_factory =
         base::Bind(&CreateServiceManagerConnection, &delegate);
     content::ServiceManagerConnection::SetFactoryForTest(
         &service_manager_connection_factory);
   }
   *exit_code = LaunchChromeTests(default_jobs, &delegate, argc, argv);
   return true;
 }