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

This was committed in r106327 but reverted due to tsan failures. r107459 may have resolved tsan issues.
Review URL: http://codereview.chromium.org/8386007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108154 0039d316-1c4b-4281-b951-d872f2087c98

chrome/test/gpu/webgl_conformance_tests.cc

@@ -23,9 +23,6 @@ class WebGLConformanceTests : public UITest {
   }
 
   void SetUp() {
-    // Force the use of GPU hardware.
-    force_use_osmesa_ = false;
-
     // Ensure that a GPU bot is never blacklisted.
     launch_arguments_.AppendSwitch(switches::kIgnoreGpuBlacklist);
     UITest::SetUp();

chrome/test/perf/frame_rate/frame_rate_tests.cc

@@ -47,10 +47,6 @@ class FrameRateTest
   FrameRateTest() {
     show_window_ = true;
     dom_automation_enabled_ = true;
-    // Since this is a performance test, try to use the host machine's GPU
-    // instead of falling back to software-rendering.
-    force_use_osmesa_ = false;
-    disable_accelerated_compositing_ = false;
   }
 
   virtual FilePath GetDataPath(const std::string& name) {

chrome/test/ui/ui_test.cc

@@ -51,7 +51,6 @@
 #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"
@@ -90,9 +89,7 @@ UITestBase::UITestBase()
       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_);
 }
@@ -107,9 +104,7 @@ UITestBase::UITestBase(MessageLoop::Type msg_loop_type)
       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_);
 }
@@ -520,27 +515,6 @@ void UITest::SetUp() {
                   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();
 }

chrome/test/ui/ui_test.h

@@ -356,12 +356,6 @@ class UITestBase {
   // PID file for websocket server.
   FilePath websocket_pid_file_;
 
-  // Whether to force use of mesa for GL rendering.
-  bool force_use_osmesa_;
-
-  // Whether to disable accelerated compositing for this test.
-  bool disable_accelerated_compositing_;
-
  private:
   // Time the test was started (so we can check for new crash dumps)
   base::Time test_start_time_;