linux_aura: Reenable parallel_jobs_

base/test/launcher/test_launcher.cc

 // Copyright 2013 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.
 
 #include "base/test/launcher/test_launcher.h"
 
 #if defined(OS_POSIX)
 #include <fcntl.h>
 #endif
 
@@ skipping 312 matching lines @@
 
     // Enable test retries by default for bots. This can be still overridden
     // from command line using --test-launcher-retry-limit flag.
     retry_limit_ = 3;
   } else {
     // Default to serial test execution if not running on a bot. This makes it
     // possible to disable stdio redirection and can still be overridden with
     // --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() {
   if (worker_pool_owner_)
     worker_pool_owner_->pool()->Shutdown();
 }
 
 bool TestLauncher::Run(int argc, char** argv) {
   if (!Init())
     return false;
@@ skipping 650 matching lines @@
 
     g_live_processes.Get().erase(process_handle);
   }
 
   base::CloseProcessHandle(process_handle);
 
   return exit_code;
 }
 
 }  // namespace base