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

chrome/test/ui/ui_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/ui/ui_test.h"
 
 #if defined(OS_POSIX)
 #include <signal.h>
 #include <sys/types.h>
 #endif
 
 #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"
 #include "base/environment.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/platform_thread.h"
 #include "base/process_util.h"
 #include "base/scoped_ptr.h"
@@ skipping 656 matching lines @@
   // No default browser check, it would create an info-bar (if we are not the
   // default browser) that could conflicts with some tests expectations.
   command_line.AppendSwitch(switches::kNoDefaultBrowserCheck);
 
   // This is a UI test.
   command_line.AppendSwitchASCII(switches::kTestType, kUITestType);
 
   // 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);
 
   if (dom_automation_enabled_)
     command_line.AppendSwitch(switches::kDomAutomationController);
 
   if (include_testing_id_) {
     command_line.AppendSwitchASCII(switches::kTestingChannelID,
                                    server_->channel_id());
@@ skipping 468 matching lines @@
   }
 
   LOG(INFO) << "Elapsed time: " << (base::Time::Now() - start).InSecondsF()
             << " seconds"
             << " call failed " << fail_count << " times"
             << " state was incorrect " << incorrect_state_count << " times";
   ADD_FAILURE() << "Timeout reached in " << __FUNCTION__;
   return false;
 }