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

chrome/test/ui/ui_test.cc

Index: chrome/test/ui/ui_test.cc
===================================================================
--- chrome/test/ui/ui_test.cc	(revision 65556)
+++ chrome/test/ui/ui_test.cc	(working copy)
@@ -12,6 +12,8 @@
 #include <set>
 #include <vector>
 
+#include "app/app_switches.h"
+#include "app/gfx/gl/gl_implementation.h"
 #include "app/sql/connection.h"
 #include "base/base_switches.h"
 #include "base/command_line.h"
@@ -688,6 +690,14 @@
   // Tell the browser to use a temporary directory just for this test.
   command_line.AppendSwitchPath(switches::kUserDataDir, user_data_dir());
 
+  // 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);
+
   // We need cookies on file:// for things like the page cycler.
   if (enable_file_cookies_)
     command_line.AppendSwitch(switches::kEnableFileCookies);