Adds option to run browser tests in mash

chrome/test/base/browser_tests_main.cc

Index: chrome/test/base/browser_tests_main.cc
diff --git a/chrome/test/base/browser_tests_main.cc b/chrome/test/base/browser_tests_main.cc
index b70df69f8f151765c59999d9af7e3dedfc65b32c..cd12f3bba01b023d1624823ef7418d9221ec896c 100644
--- a/chrome/test/base/browser_tests_main.cc
+++ b/chrome/test/base/browser_tests_main.cc
@@ -8,7 +8,17 @@
 #include "chrome/test/base/chrome_test_launcher.h"
 #include "chrome/test/base/chrome_test_suite.h"
 
+#if defined(MOJO_SHELL_CLIENT)
+#include "chrome/test/base/mash_browser_tests_main.h"
+#endif
+
 int main(int argc, char** argv) {
+#if defined(MOJO_SHELL_CLIENT)
+  int exit_code = 0;
+  if (RunMashBrowserTests(argc, argv, &exit_code))
+    return exit_code;
+#endif
+
   int default_jobs = std::max(1, base::SysInfo::NumberOfProcessors() / 2);
   ChromeTestSuiteRunner runner;
   ChromeTestLauncherDelegate delegate(&runner);