Moved --use-gl=osmesa to UITest::SetUp so it is not visible to pyautolib....

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
@@ skipping 672 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 128 matching lines @@
 
 void UITest::SetUp() {
   // Pass the test case name to chrome.exe on the command line to help with
   // parsing Purify output.
   const testing::TestInfo* const test_info =
       testing::UnitTest::GetInstance()->current_test_info();
   if (test_info) {
     set_ui_test_name(test_info->test_case_name() + std::string(".") +
                      test_info->name());
   }
+
+  // Force tests to use OSMesa if they launch the GPU process. This is in
+  // UITest::SetUp so that it does not affect pyautolib, which runs tests that
+  // do not work with OSMesa.
+  launch_arguments_.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
+  launch_arguments_.AppendSwitch(switches::kDisableAcceleratedCompositing);
+
   UITestBase::SetUp();
   PlatformTest::SetUp();
 }
 
 void UITest::TearDown() {
   UITestBase::TearDown();
   PlatformTest::TearDown();
 }
 
 AutomationProxy* UITest::CreateAutomationProxy(int execution_timeout) {
@@ skipping 320 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;
 }