Changes around how browser_tests are launched for 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 614091d3ad9e4ef7cd7f5b9ceac10eb6d6c4e318..b70df69f8f151765c59999d9af7e3dedfc65b32c 100644
--- a/chrome/test/base/browser_tests_main.cc
+++ b/chrome/test/base/browser_tests_main.cc
@@ -8,17 +8,7 @@
 #include "chrome/test/base/chrome_test_launcher.h"
 #include "chrome/test/base/chrome_test_suite.h"
 
-#if defined(USE_AURA)
-#include "chrome/test/base/mash_browser_tests_main.h"
-#endif
-
 int main(int argc, char** argv) {
-#if defined(USE_AURA)
-  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);