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

chrome/browser/gpu_browsertest.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 "base/command_line.h"
 #include "base/path_service.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 15 matching lines @@
 
   virtual void SetUpInProcessBrowserTestFixture() {
     FilePath test_dir;
     ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_dir));
     gpu_test_dir_ = test_dir.AppendASCII("gpu");
   }
 
   virtual void SetUpCommandLine(CommandLine* command_line) {
     InProcessBrowserTest::SetUpCommandLine(command_line);
 
-    EXPECT_TRUE(test_launcher_utils::OverrideGLImplementation(
-        command_line,
-        gfx::kGLImplementationOSMesaName));
+    // GPU tests require gpu acceleration.
+    // We do not care which GL backend is used.
+    command_line->AppendSwitchASCII(switches::kUseGL, "any");
 
     command_line->AppendSwitch(switches::kDisablePopupBlocking);
-
-#if defined(OS_MACOSX)
-    // Accelerated compositing does not work with OSMesa. AcceleratedSurface
-    // assumes GL contexts are native.
-    command_line->AppendSwitch(switches::kDisableAcceleratedCompositing);
-#endif
   }
 
   FilePath gpu_test_dir_;
 };
 
-#if defined(TOOLKIT_VIEWS)
-// Flaky on Windows (dbg): http://crbug.com/72608
-// For ChromeOS: http://crbug.com/76217
-#define MAYBE_BrowserTestCanLaunchWithOSMesa DISABLED_BrowserTestCanLaunchWithOSMesa
-#else
-#define MAYBE_BrowserTestCanLaunchWithOSMesa BrowserTestCanLaunchWithOSMesa
-#endif
-
-IN_PROC_BROWSER_TEST_F(GPUBrowserTest, MAYBE_BrowserTestCanLaunchWithOSMesa) {
-  // Check the webgl test reports success and that the renderer was OSMesa.
-  ui_test_utils::NavigateToURL(
-      browser(),
-      net::FilePathToFileURL(gpu_test_dir_.AppendASCII("webgl.html")));
-
-  EXPECT_EQ(ASCIIToUTF16("SUCCESS: WebKit WebGL"),
-            browser()->GetSelectedTabContents()->GetTitle());
-}
-
 // Test is flaky and timing out.  See crbug.com/99883
 IN_PROC_BROWSER_TEST_F(GPUBrowserTest,
                        DISABLED_CanOpenPopupAndRenderWithWebGLCanvas) {
   ui_test_utils::DOMMessageQueue message_queue;
 
   ui_test_utils::NavigateToURL(
       browser(),
       net::FilePathToFileURL(gpu_test_dir_.AppendASCII("webgl_popup.html")));
 
   std::string result;
   ASSERT_TRUE(message_queue.WaitForMessage(&result));
   EXPECT_EQ("\"SUCCESS\"", result);
 }
 
 IN_PROC_BROWSER_TEST_F(GPUBrowserTest, CanOpenPopupAndRenderWith2DCanvas) {
   ui_test_utils::DOMMessageQueue message_queue;
 
   ui_test_utils::NavigateToURL(
       browser(),
       net::FilePathToFileURL(gpu_test_dir_.AppendASCII("canvas_popup.html")));
 
   std::string result;
   ASSERT_TRUE(message_queue.WaitForMessage(&result));
   EXPECT_EQ("\"SUCCESS\"", result);
 }