| Index: chrome/test/test_launcher_utils.cc
|
| ===================================================================
|
| --- chrome/test/test_launcher_utils.cc (revision 65433)
|
| +++ chrome/test/test_launcher_utils.cc (working copy)
|
| @@ -35,9 +35,12 @@
|
|
|
| // TODO(apatrick): Other pending changes will fix this for mac.
|
| #if !defined(OS_MACOSX)
|
| - // Force all tests to use OSMesa if they launch the GPU process.
|
| - command_line->AppendSwitchASCII(switches::kUseGL,
|
| - gfx::kGLImplementationOSMesaName);
|
| + if (!command_line->HasSwitch(switches::kUseGL)) {
|
| + // Force all tests to use OSMesa if they launch the GPU process without
|
| + // explicitly specifying a GL implementation.
|
| + command_line->AppendSwitchASCII(switches::kUseGL,
|
| + gfx::kGLImplementationOSMesaName);
|
| + }
|
| #endif
|
| }
|
|
|
|
|