Mus Browser Tests

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"
@@ skipping 22 matching lines @@
 #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 "services/ui/common/switches.h"
 #include "ui/aura/env.h"
 
 namespace {
 
-const base::FilePath::CharType kCatalogFilename[] =
+const base::FilePath::CharType kMashCatalogFilename[] =
     FILE_PATH_LITERAL("mash_browser_tests_catalog.json");
+const base::FilePath::CharType kMusCatalogFilename[] =
+    FILE_PATH_LITERAL("mus_browser_tests_catalog.json");
 
 void ConnectToDefaultApps(service_manager::Connector* connector) {
   connector->StartService(mash::session::mojom::kServiceName);
 }
 
 class MashTestSuite : public ChromeTestSuite {
  public:
   MashTestSuite(int argc, char** argv) : ChromeTestSuite(argc, argv) {}
 
   void SetMojoTestConnector(std::unique_ptr<MojoTestConnector> connector) {
@@ skipping 12 matching lines @@
   }
 
   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() : ChromeTestLauncherDelegate(nullptr) {
+    base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
+    config_ = command_line->HasSwitch("run-in-mash")
+                  ? MojoTestConnector::Config::MASH
+                  : MojoTestConnector::Config::MUS;
+  }
   ~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()));
+        base::MakeUnique<MojoTestConnector>(ReadCatalogManifest(), config_));
     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());
+          base::MakeUnique<MojoTestConnector>(ReadCatalogManifest(), config_);
       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);
+    base::FilePath catalog_path = exe_path.Append(
+        config_ == MojoTestConnector::Config::MASH ? kMashCatalogFilename
+                                                   : kMusCatalogFilename);
     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;
   }
 
+  MojoTestConnector::Config config_;
+
   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(
@@ skipping 15 matching lines @@
       std::move(service_request));
   context.SetQuitClosure(run_loop.QuitClosure());
   run_loop.Run();
 }
 
 }  // namespace
 
 bool RunMashBrowserTests(int argc, char** argv, int* exit_code) {
   base::CommandLine::Init(argc, argv);
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
-  if (!command_line->HasSwitch("run-in-mash"))
+  if (!command_line->HasSwitch("run-in-mash") &&
+      !command_line->HasSwitch("run-in-mus")) {
     return false;
+  }
 
   if (command_line->HasSwitch(MojoTestConnector::kMashApp)) {
 #if defined(OS_LINUX)
     base::AtExitManager exit_manager;
 #endif
     base::i18n::InitializeICU();
 
 #if !defined(OFFICIAL_BUILD)
     base::debug::EnableInProcessStackDumping();
 #endif
@@ skipping 14 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;
 }