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

chrome/browser/gpu_pixel_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 <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
@@ skipping 91 matching lines @@
 // Test fixture for GPU image comparison tests.
 // TODO(kkania): Document how to add to/modify these tests.
 class GpuPixelBrowserTest : public InProcessBrowserTest {
  public:
   GpuPixelBrowserTest() {}
 
   virtual void SetUpCommandLine(CommandLine* command_line) {
     // This enables DOM automation for tab contents.
     EnableDOMAutomation();
 
-    // These tests by default use OSMesa. This can be changed if the |kUseGL|
-    // switch is explicitly set to something else or if |kUseGpuInTests| is
-    // present.
-    if (command_line->HasSwitch(switches::kUseGL)) {
-      using_gpu_ = command_line->GetSwitchValueASCII(switches::kUseGL) !=
-          gfx::kGLImplementationOSMesaName;
-    } else if (command_line->HasSwitch(kUseGpuInTests)) {
-      using_gpu_ = true;
-    } else {
-      // OSMesa will be used by default.
-      EXPECT_TRUE(test_launcher_utils::OverrideGLImplementation(
-          command_line,
-          gfx::kGLImplementationOSMesaName));
-#if defined(OS_MACOSX)
-      // Accelerated compositing does not work with OSMesa. AcceleratedSurface
-      // assumes GL contexts are native.
-      command_line->AppendSwitch(switches::kDisableAcceleratedCompositing);
-#endif
-      using_gpu_ = false;
+    // These tests by default use any GL implementation it can find.
+    // This can be changed if the |kUseGL| switch is explicitly set to
+    // something or if |kUseGpuInTests| is present.
+    if (!command_line->HasSwitch(switches::kUseGL) &&
+        !command_line->HasSwitch(kUseGpuInTests)) {
+      command_line->AppendSwitchASCII(switches::kUseGL, "any");
     }
     // Allow file access from "file://" protocol. Otherwise, test fails with
     // "Uncaught Error: SECURITY_ERR: DOM Exception 18."
     command_line->AppendSwitch(switches::kAllowFileAccessFromFiles);
   }
 
   virtual void SetUpInProcessBrowserTestFixture() {
     ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir_));
     test_data_dir_ = test_data_dir_.AppendASCII("gpu");
 
     CommandLine* command_line = CommandLine::ForCurrentProcess();
     if (command_line->HasSwitch(kGeneratedDir))
       generated_img_dir_ = command_line->GetSwitchValuePath(kGeneratedDir);
     else
       generated_img_dir_ = test_data_dir_.AppendASCII("generated");
 
-    if (using_gpu_)
-      reference_img_dir_ = test_data_dir_.AppendASCII("gpu_reference");
-    else
-      reference_img_dir_ = test_data_dir_.AppendASCII("sw_reference");
-
     test_name_ = testing::UnitTest::GetInstance()->current_test_info()->name();
     const char* test_status_prefixes[] = {"DISABLED_", "FLAKY_", "FAILS_"};
     for (size_t i = 0; i < arraysize(test_status_prefixes); ++i) {
       ReplaceFirstSubstringAfterOffset(
           &test_name_, 0, test_status_prefixes[i], "");
     }
   }
 
   // Compares the generated bitmap with the appropriate reference image on disk.
   // The reference image is determined by the name of the test, the |postfix|,
   // and the vendor and device ID. Returns true iff the images were the same.
   //
   // |postfix|, is an optional name that can be appended onto the images name to
   // distinguish between images from a single test.
   //
   // On failure, the image will be written to disk, and can be collected as a
   // baseline. The image format is:
   //     <test_name>_<postfix>_<os>_<vendor_id>-<device_id>.png
   // E.g.,
   //     WebGLFishTank_FirstTab_120981-1201.png
   bool CompareImages(const SkBitmap& gen_bmp, const std::string& postfix) {
     // Determine the name of the image.
     std::string img_name = test_name_;
+    FilePath ref_img_dir;
     if (postfix.length())
       img_name += "_" + postfix;
 #if defined(OS_WIN)
       const char* os_label = "win";
 #elif defined(OS_MACOSX)
       const char* os_label = "mac";
 #elif defined(OS_LINUX)
       const char* os_label = "linux";
 #else
 #error "Not implemented for this platform"
 #endif
-    if (using_gpu_) {
-      GPUInfo info;
-      if (!GetGPUInfo(&info)) {
-        LOG(ERROR) << "Could not get gpu info";
-        return false;
-      }
+    GPUInfo info;
+    if (!GetGPUInfo(&info)) {
+      LOG(ERROR) << "Could not get gpu info";
+      return false;
+    }
+    // TODO(alokp): Why do we treat Mesa differently?
+    bool using_gpu = info.gl_renderer.compare(0, 4, "Mesa") != 0;
+    if (using_gpu) {
+      ref_img_dir = test_data_dir_.AppendASCII("gpu_reference");
       img_name = base::StringPrintf("%s_%s_%04x-%04x.png",
           img_name.c_str(), os_label, info.vendor_id, info.device_id);
     } else {
+      ref_img_dir = test_data_dir_.AppendASCII("sw_reference");
       img_name = base::StringPrintf("%s_%s_mesa.png",
           img_name.c_str(), os_label);
     }
 
     // Read the reference image and verify the images' dimensions are equal.
-    FilePath ref_img_path = reference_img_dir_.AppendASCII(img_name);
+    FilePath ref_img_path = ref_img_dir.AppendASCII(img_name);
     SkBitmap ref_bmp;
     bool should_compare = true;
     if (!ReadPNGFile(ref_img_path, &ref_bmp)) {
       LOG(ERROR) << "Cannot read reference image: " << ref_img_path.value();
       should_compare = false;
     }
     if (should_compare &&
         (ref_bmp.width() != gen_bmp.width() ||
          ref_bmp.height() != gen_bmp.height())) {
       LOG(ERROR)
@@ skipping 46 matching lines @@
       }
       return false;
     }
     return true;
   }
 
  protected:
   FilePath test_data_dir_;
 
  private:
-  FilePath reference_img_dir_;
   FilePath generated_img_dir_;
   // The name of the test, with any special prefixes dropped.
   std::string test_name_;
-  // Whether the gpu, or OSMesa is being used for rendering.
-  bool using_gpu_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuPixelBrowserTest);
 };
 
 #if defined(OS_LINUX)
 // Currently fails (and times out) on linux due to a NOTIMPLEMENTED() statement.
 // (http://crbug.com/89964)
 #define MAYBE_WebGLTeapot DISABLED_WebGLTeapot
 #elif defined(OS_WIN)
 // Fails (and times out) on Windows due to pixel mismatch.
@@ skipping 14 matching lines @@
   ASSERT_TRUE(message_queue.WaitForMessage(NULL));
 
   SkBitmap bitmap;
   gfx::Size container_size(500, 500);
   ResizeTabContainer(browser(), container_size);
   ASSERT_TRUE(ui_test_utils::TakeRenderWidgetSnapshot(
       browser()->GetSelectedTabContents()->render_view_host(),
       container_size, &bitmap));
   ASSERT_TRUE(CompareImages(bitmap, ""));
 }