Enable GpuPixelBrowserTest.WebGLTeapot and add a test option for picking a cu...

chrome/test/gpu/gpu_pixel_browsertest.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 <string>
 #include <vector>
 
 #include "app/app_switches.h"
 #include "app/gfx/gl/gl_implementation.h"
 #include "base/callback.h"
@@ skipping 21 matching lines @@
 #include "net/base/net_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkColor.h"
 
 namespace {
 
 // Command line flag for forcing the machine's GPU to be used instead of OSMesa.
 const char kUseGpuInTests[] = "use-gpu-in-tests";
 
+// Command line flag for overriding the default location for putting generated
+// test images that do not match references.
+const char kGeneratedDir[] = "generated-dir";
+
 // Reads and decodes a PNG image to a bitmap. Returns true on success. The PNG
 // should have been encoded using |gfx::PNGCodec::Encode|.
 bool ReadPNGFile(const FilePath& file_path, SkBitmap* bitmap) {
   DCHECK(bitmap);
   std::string png_data;
   return file_util::ReadFileToString(file_path, &png_data) &&
          gfx::PNGCodec::Decode(reinterpret_cast<unsigned char*>(&png_data[0]),
                                png_data.length(),
                                bitmap);
 }
@@ skipping 102 matching lines @@
       // assumes GL contexts are native.
       command_line->AppendSwitch(switches::kDisableAcceleratedCompositing);
 #endif
       using_gpu_ = false;
     }
   }
 
   virtual void SetUpInProcessBrowserTestFixture() {
     ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir_));
     test_data_dir_ = test_data_dir_.AppendASCII("gpu");
-    generated_img_dir_ = test_data_dir_.AppendASCII("generated");
+
+    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], "");
@@ skipping 110 matching lines @@
   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);
 };
 
-// This test does not run on Linux because the information about the gfx card is
-// not available yet.
-#if !defined(OS_LINUX)
-// Mark this as failing because we don't have the reference images yet. Once the
-// images are generated on the bots, they will be uploaded and this status will
-// be changed.
-#define MAYBE_WebGLTeapot FAILS_WebGLTeapot
-#else
-#define MAYBE_WebGLTeapot DISABLED_WebGLTeapot
-#endif
-IN_PROC_BROWSER_TEST_F(GpuPixelBrowserTest, MAYBE_WebGLTeapot) {
+IN_PROC_BROWSER_TEST_F(GpuPixelBrowserTest, WebGLTeapot) {
   ui_test_utils::DOMMessageQueue message_queue;
   ui_test_utils::NavigateToURL(
       browser(),
       net::FilePathToFileURL(test_data_dir_.AppendASCII("webgl_teapot").
           AppendASCII("teapot.html")));
 
   // Wait for message from teapot page indicating the GL calls have been issued.
   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, ""));
 }