Adds option to run browser tests in mash

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/process/launch.h"
+#include "base/sys_info.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/common/mojo_shell_connection.h"
+#include "content/public/test/test_launcher.h"
+#include "mojo/shell/public/cpp/connector.h"
+#include "mojo/shell/public/cpp/shell_client.h"
+#include "mojo/shell/public/cpp/shell_connection.h"
+#include "mojo/shell/runner/common/switches.h"
+#include "mojo/shell/runner/host/child_process.h"
+#include "mojo/shell/runner/init.h"
+
+namespace {
+
+void ConnectToDefaultApps(mojo::Connector* connector) {
+  connector->Connect("mojo:mash_session");
+}
+
+// Used to setup the command line for passing a mojo channel to tests.
+class MashTestLauncherDelegate : public ChromeTestLauncherDelegate {
+ public:
+  explicit MashTestLauncherDelegate(ChromeTestSuiteRunner* runner)
+      : ChromeTestLauncherDelegate(runner) {}
+  ~MashTestLauncherDelegate() override {}
+
+  MojoTestConnector* GetMojoTestConnector() {
+    if (!mojo_test_connector_)
+      mojo_test_connector_.reset(new MojoTestConnector);
+    return mojo_test_connector_.get();
+  }
+
+ private:
+  // ChromeTestLauncherDelegate:
+  scoped_ptr<content::TestState> PreRunTest(
+      base::CommandLine* command_line,
+      base::TestLauncher::LaunchOptions* test_launch_options) override {
+    if (!mojo_test_connector_) {
+      mojo_test_connector_.reset(new MojoTestConnector);
+      shell_client_.reset(new mojo::ShellClient);
+      shell_connection_.reset(new mojo::ShellConnection(
+          shell_client_.get(), mojo_test_connector_->Init()));
+      ConnectToDefaultApps(shell_connection_->connector());
+    }
+    return GetMojoTestConnector()->PrepareForTest(command_line,
+                                                  test_launch_options);
+  }
+
+  scoped_ptr<MojoTestConnector> mojo_test_connector_;
+  scoped_ptr<mojo::ShellClient> shell_client_;
+  scoped_ptr<mojo::ShellConnection> shell_connection_;
+
+  DISALLOW_COPY_AND_ASSIGN(MashTestLauncherDelegate);
+};
+
+void CreateMojoShellConnection(MashTestLauncherDelegate* delegate) {
+  const bool is_external_shell = true;
+  content::MojoShellConnection::Create(delegate->GetMojoTestConnector()->Init(),
+                                       is_external_shell);
+  ConnectToDefaultApps(content::MojoShellConnection::Get()->GetConnector());
+}
+
+}  // namespace
+
+bool RunMashBrowserTests(int argc, char** argv, int* exit_code) {
+  base::CommandLine::Init(argc, argv);
+  const base::CommandLine& command_line =
+      *base::CommandLine::ForCurrentProcess();
+  if (!command_line.HasSwitch("run-in-mash"))
+    return false;
+
+  if (command_line.HasSwitch(switches::kChildProcess) &&
+      !command_line.HasSwitch(MojoTestConnector::kTestSwitch)) {
+    base::AtExitManager at_exit;
+    mojo::shell::InitializeLogging();
+    mojo::shell::WaitForDebuggerIfNecessary();
+#if !defined(OFFICIAL_BUILD) && defined(OS_WIN)
+    base::RouteStdioToConsole(false);
+#endif
+    *exit_code = mojo::shell::ChildProcessMain();
+    return true;
+  }
+
+  int default_jobs = std::max(1, base::SysInfo::NumberOfProcessors() / 2);
+  ChromeTestSuiteRunner runner;
+  MashTestLauncherDelegate delegate(&runner);
+  // --single_process and no primoridal pipe token indicate we were run directly
+  // from the command line. In this case we have to start up MojoShellConnection
+  // as though we were embedded.
+content::MojoShellConnection::Factory shell_connection_factory;

[Ben Goodger (Google), 2016/03/19 03:24:53]

nit: indent

[sky, 2016/03/21 16:44:42]

Done.

+  if (command_line.HasSwitch(content::kSingleProcessTestsFlag) &&
+      !command_line.HasSwitch(switches::kPrimordialPipeToken)) {
+    shell_connection_factory = base::Bind(&CreateMojoShellConnection,
+                                          &delegate);
+    content::MojoShellConnection::SetFactoryForTest(&shell_connection_factory);
+  }
+  *exit_code = LaunchChromeTests(default_jobs, &delegate, argc, argv);
+  return true;
+}