Index: base/test/launcher/test_launcher.cc |
diff --git a/base/test/launcher/test_launcher.cc b/base/test/launcher/test_launcher.cc |
index b997d970ba7c9955516b5f045a7b369ed7c362a3..8379091eb9769db327e68ce550fee884145c8622 100644 |
--- a/base/test/launcher/test_launcher.cc |
+++ b/base/test/launcher/test_launcher.cc |
@@ -330,17 +330,6 @@ TestLauncher::TestLauncher(TestLauncherDelegate* launcher_delegate, |
// --test-launcher-jobs flag. |
parallel_jobs_ = 1; |
} |
- |
-#if defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS) |
- // TODO(erg): Trying to parallelize tests on linux_aura makes things flaky |
- // because all shards share X11 state. http://crbug.com/326701 |
- parallel_jobs_ = 1; |
- |
- fprintf(stdout, |
- "Disabling parallelization due to the linux_aura flake. " |
- "http://crbug.com/326701\n"); |
- fflush(stdout); |
-#endif |
} |
TestLauncher::~TestLauncher() { |