Changes around how browser_tests are launched for mash

chrome/test/base/browser_tests_main_chromeos.cc

Index: chrome/test/base/browser_tests_main_chromeos.cc
diff --git a/chrome/test/base/browser_tests_main.cc b/chrome/test/base/browser_tests_main_chromeos.cc
similarity index 84%
copy from chrome/test/base/browser_tests_main.cc
copy to chrome/test/base/browser_tests_main_chromeos.cc
index 614091d3ad9e4ef7cd7f5b9ceac10eb6d6c4e318..6ce258fb0665a471f967e02b3697965d396c8c38 100644
--- a/chrome/test/base/browser_tests_main.cc
+++ b/chrome/test/base/browser_tests_main_chromeos.cc
@@ -1,4 +1,4 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -7,17 +7,12 @@
 #include "base/sys_info.h"
 #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;