Disable GPU process prelaunching in content_browsertests on Linux. This is...

Disable GPU process prelaunching in content_browsertests on Linux. This is causing lots of crashes inside base::LaunchProcess.

BUG=139209,90448
TBR=zmo
Review URL: https://chromiumcodereview.appspot.com/10827053

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148625 0039d316-1c4b-4281-b951-d872f2087c98

content/public/common/content_switches.cc

@@ -118,7 +118,7 @@ const char kDisableGLMultisampling[]        = "disable-gl-multisampling";
 
 // Do not launch the GPU process shortly after browser process launch. Instead
 // launch it when it is first needed.
-const char kDisableGpuProcessPrelaunch[]    = "diasable-gpu-process-prelaunch";
+const char kDisableGpuProcessPrelaunch[]    = "disable-gpu-process-prelaunch";
 
 // Disable the GPU process sandbox.
 const char kDisableGpuSandbox[]             = "disable-gpu-sandbox";

content/test/content_browser_test.cc

@@ -49,6 +49,11 @@ void ContentBrowserTest::SetUp() {
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   command_line->AppendSwitch(switches::kContentBrowserTest);
 
+#if defined(OS_LINUX)
+  // http://crbug.com/139209
+  command_line->AppendSwitch(switches::kDisableGpuProcessPrelaunch);
+#endif
+
   SetUpCommandLine(command_line);
 
 #if defined(OS_MACOSX)