| Index: content/browser/browser_main_loop.cc
|
| ===================================================================
|
| --- content/browser/browser_main_loop.cc (revision 142968)
|
| +++ content/browser/browser_main_loop.cc (working copy)
|
| @@ -588,20 +588,6 @@
|
| 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();
|
|
|