Introduce content::TestLauncherDelegate.AdjustDefaultParallelJobs() to allow us to auto-disable par…

chrome/test/base/chrome_test_launcher.cc

Index: chrome/test/base/chrome_test_launcher.cc
diff --git a/chrome/test/base/chrome_test_launcher.cc b/chrome/test/base/chrome_test_launcher.cc
index adb77472483ed9a8706cced587c17fdd47e80041..428c6640298e3863e20968855def8cab2aed44c1 100644
--- a/chrome/test/base/chrome_test_launcher.cc
+++ b/chrome/test/base/chrome_test_launcher.cc
@@ -20,6 +20,7 @@
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/chrome_test_suite.h"
+#include "chrome/test/base/test_switches.h"
 #include "content/public/app/content_main.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/test/test_utils.h"
@@ -119,6 +120,18 @@ class ChromeTestLauncherDelegate : public content::TestLauncherDelegate {
 #endif
   }
 
+  virtual void AdjustDefaultParallelJobs(int* default_jobs) OVERRIDE {
+#if defined(OS_WIN) && defined(USE_AURA)
+    if (CommandLine::ForCurrentProcess()->HasSwitch(
+            switches::kAshBrowserTests)) {
+      *default_jobs = 1;
+      fprintf(stdout,
+              "Disabling test parallelization for --ash-browsertests.\n");
+      fflush(stdout);
+    }
+#endif  // defined(OS_WIN) && defined(USE_AURA)
+  }
+
  private:
 #if !defined(USE_AURA) && defined(TOOLKIT_VIEWS)
   std::stack<linked_ptr<views::AcceleratorHandler> > handlers_;