Merge 143711 - Do not prelaunch GPU process at browser startup.

This is to determine if initializing the GPU process in every session is responsible for an increase in GPU process crashes.
Review URL: https://chromiumcodereview.appspot.com/10635007

TBR=apatrick@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10748020

git-svn-id: svn://svn.chromium.org/chrome/branches/1180/src@145817 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 0 insertions, 14 deletions

diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
index d202111..5ce5c3e 100644
--- a/content/browser/browser_main_loop.cc
+++ b/content/browser/browser_main_loop.cc
@@ -588,20 +588,6 @@ void BrowserMainLoop::BrowserThreadsStarted() {
   speech_recognition_manager_.reset(new speech::SpeechRecognitionManagerImpl());
 #endif
 
-  // When running the GPU thread in-process, avoid optimistically starting it
-  // since creating the GPU thread races against creation of the one-and-only
-  // ChildProcess instance which is created by the renderer thread.
-  if (!parsed_command_line_.HasSwitch(switches::kDisableGpuProcessPrelaunch) &&
-      !parsed_command_line_.HasSwitch(switches::kSingleProcess) &&
-      !parsed_command_line_.HasSwitch(switches::kInProcessGPU)) {
-    TRACE_EVENT_INSTANT0("gpu", "Post task to launch GPU process");
-    BrowserThread::PostTask(
-        BrowserThread::IO, FROM_HERE, base::Bind(
-            base::IgnoreResult(&GpuProcessHost::Get),
-            GpuProcessHost::GPU_PROCESS_KIND_SANDBOXED,
-            content::CAUSE_FOR_GPU_LAUNCH_BROWSER_STARTUP));
-  }
-
   // Start the GpuDataManager before we set up the MessageLoops because
   // otherwise we'll trigger the assertion about doing IO on the UI thread.
   content::GpuDataManager::GetInstance();