Moved --use-gl=osmesa switch out of test_launcher_utils

chrome/test/in_process_browser_test.cc

 // Copyright (c) 2010 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 "chrome/test/in_process_browser_test.h"
 
+#include "app/app_switches.h"
+#include "app/gfx/gl/gl_implementation.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/mac/scoped_nsautorelease_pool.h"
 #include "base/path_service.h"
 #include "base/string_number_conversions.h"
 #include "base/test/test_file_util.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_navigator.h"
@@ skipping 127 matching lines @@
   if (!command_line->HasSwitch(kUnitTestShowWindows) && !show_window_)
     BrowserView::SetShowState(SW_HIDE);
 #endif
 
   if (dom_automation_enabled_)
     command_line->AppendSwitch(switches::kDomAutomationController);
 
   // This is a Browser test.
   command_line->AppendSwitchASCII(switches::kTestType, kBrowserTestType);
 
+  // Force tests to use OSMesa if they launch the GPU process.
+  command_line->AppendSwitchASCII(switches::kUseGL,
+                                  gfx::kGLImplementationOSMesaName);
+
+  // Mac does not support accelerated compositing with OSMesa. Disable on all
+  // platforms so it is consistent. http://crbug.com/58343
+  command_line->AppendSwitch(switches::kDisableAcceleratedCompositing);
+
   // Single-process mode is not set in BrowserMain so it needs to be processed
   // explicitly.
   original_single_process_ = RenderProcessHost::run_renderer_in_process();
   if (command_line->HasSwitch(switches::kSingleProcess))
     RenderProcessHost::set_run_renderer_in_process(true);
 
 #if defined(OS_WIN)
   // The Windows sandbox requires that the browser and child processes are the
   // same binary.  So we launch browser_process.exe which loads chrome.dll
   command_line->AppendSwitchPath(switches::kBrowserSubprocessPath,
@@ skipping 201 matching lines @@
     return;
 
   // Invoke CloseAllBrowsersAndExit on a running message loop.
   // CloseAllBrowsersAndExit exits the message loop after everything has been
   // shut down properly.
   MessageLoopForUI::current()->PostTask(
       FROM_HERE,
       NewRunnableFunction(&BrowserList::CloseAllBrowsersAndExit));
   ui_test_utils::RunMessageLoop();
 }