Used use-gl=any instead of forcing osmesa for UI tests.

chrome/test/ui/ui_test.cc

 // Copyright (c) 2011 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 33 matching lines @@
 #include "chrome/test/automation/javascript_execution_controller.h"
 #include "chrome/test/automation/proxy_launcher.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/automation/window_proxy.h"
 #include "chrome/test/base/chrome_process_util.h"
 #include "chrome/test/base/test_switches.h"
 #include "content/common/debug_flags.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/net_util.h"
 #include "ui/gfx/gl/gl_implementation.h"
-#include "ui/gfx/gl/gl_switches.h"
 
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"
 #endif
 
 
 using base::Time;
 using base::TimeDelta;
 using base::TimeTicks;
 
@@ skipping 18 matching lines @@
     : launch_arguments_(CommandLine::NO_PROGRAM),
       expected_errors_(0),
       expected_crashes_(0),
       homepage_(chrome::kAboutBlankURL),
       wait_for_initial_loads_(true),
       dom_automation_enabled_(false),
       show_window_(false),
       clear_profile_(true),
       include_testing_id_(true),
       enable_file_cookies_(true),
-      profile_type_(UITestBase::DEFAULT_THEME),
-      force_use_osmesa_(true),
-      disable_accelerated_compositing_(true) {
+      profile_type_(UITestBase::DEFAULT_THEME) {
   PathService::Get(chrome::DIR_APP, &browser_directory_);
   PathService::Get(chrome::DIR_TEST_DATA, &test_data_directory_);
 }
 
 UITestBase::UITestBase(MessageLoop::Type msg_loop_type)
     : launch_arguments_(CommandLine::NO_PROGRAM),
       expected_errors_(0),
       expected_crashes_(0),
       wait_for_initial_loads_(true),
       dom_automation_enabled_(false),
       show_window_(false),
       clear_profile_(true),
       include_testing_id_(true),
       enable_file_cookies_(true),
-      profile_type_(UITestBase::DEFAULT_THEME),
-      force_use_osmesa_(true),
-      disable_accelerated_compositing_(true) {
+      profile_type_(UITestBase::DEFAULT_THEME) {
   PathService::Get(chrome::DIR_APP, &browser_directory_);
   PathService::Get(chrome::DIR_TEST_DATA, &test_data_directory_);
 }
 
 UITestBase::~UITestBase() {}
 
 void UITestBase::SetUp() {
   // Tests that do a session restore (e.g. SessionRestoreUITest, StartupTest)
   // call SetUp() multiple times because they restart the browser mid-test.
   // We don't want to reset the ProxyLauncher's state in those cases.
@@ skipping 390 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_test_name(test_info->test_case_name() + std::string(".") +
                   test_info->name());
   }
 
-  // UI tests force the use of OSMesa by default because of various bad
-  // interactions between the GPU infrastructure, how our bots are configured,
-  // and existing performance expectations.  The goal to slowly remove these
-  // special cases, as covered by:
-  // http://code.google.com/p/chromium/issues/detail?id=95782
-  //
-  // Note also that this disabling is done in UITest to avoid affecting
-  // pyautolib, which runs tests that do not work with OSMesa.
-  if (force_use_osmesa_) {
-    launch_arguments_.AppendSwitchASCII(switches::kUseGL,
-                                        gfx::kGLImplementationOSMesaName);
-  }
-
-  // Disable acclerated compositing for tests unless they directly opt-in. The
-  // rationale for this is identical to the use of OSMesa: bad interactions
-  // between tests and the accelerated compositing system. The goal is to slowly
-  // remove this flag, as covered by:
-  // http://code.google.com/p/chromium/issues/detail?id=95782
-  if (disable_accelerated_compositing_)
-    launch_arguments_.AppendSwitch(switches::kDisableAcceleratedCompositing);
-
   UITestBase::SetUp();
   PlatformTest::SetUp();
 }
 
 void UITest::TearDown() {
   UITestBase::TearDown();
   PlatformTest::TearDown();
 }
 
 ProxyLauncher* UITest::CreateProxyLauncher() {
@@ skipping 262 matching lines @@
     base::PlatformThread::Sleep(TestTimeouts::action_timeout_ms() / kCycles);
   }
 
   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;
 }