Enable webgl conformance tests under content/test/gpu in content_browsertests

content/browser/gpu/webgl_conformance_tests.cc

Index: content/browser/gpu/webgl_conformance_tests.cc
diff --git a/chrome/test/gpu/webgl_conformance_tests.cc b/content/browser/gpu/webgl_conformance_tests.cc
similarity index 77%
copy from chrome/test/gpu/webgl_conformance_tests.cc
copy to content/browser/gpu/webgl_conformance_tests.cc
index 7e23795837c034017f334766699a7c84ce53c183..f9487b5aa5b569da5c0fade028949d2cf152a772 100644
--- a/chrome/test/gpu/webgl_conformance_tests.cc
+++ b/content/browser/gpu/webgl_conformance_tests.cc
@@ -5,18 +5,21 @@
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
-#include "chrome/browser/ui/browser.h"
-#include "chrome/common/chrome_paths.h"
-#include "chrome/test/base/in_process_browser_test.h"
-#include "chrome/test/base/ui_test_utils.h"
+#include "base/utf_string_conversions.h"
+#include "content/public/browser/web_contents.h"
+#include "content/public/common/content_paths.h"
 #include "content/public/common/content_switches.h"
+#include "content/public/test/browser_test_utils.h"
+#include "content/shell/shell.h"
+#include "content/test/content_browser_test.h"
+#include "content/test/content_browser_test_utils.h"
 #include "content/test/gpu/gpu_test_config.h"
 #include "content/test/gpu/gpu_test_expectations_parser.h"
 #include "net/base/net_util.h"
 
-namespace {
+namespace content {
 
-class WebGLConformanceTests : public InProcessBrowserTest {
+class WebGLConformanceTests : public ContentBrowserTest {
  public:
   WebGLConformanceTests() {}
 
@@ -35,7 +38,7 @@ class WebGLConformanceTests : public InProcessBrowserTest {
     ASSERT_TRUE(file_util::DirectoryExists(webgl_conformance_path))
         << "Missing conformance tests: " << webgl_conformance_path.value();
 
-    PathService::Get(chrome::DIR_TEST_DATA, &test_path_);
+    PathService::Get(content::DIR_TEST_DATA, &test_path_);

[jam, 2012/09/24 16:45:37]

nit: get rid of "content::" in this file

     test_path_ = test_path_.Append(FILE_PATH_LITERAL("gpu"));
     test_path_ = test_path_.Append(FILE_PATH_LITERAL("webgl_conformance.html"));
 
@@ -58,14 +61,13 @@ class WebGLConformanceTests : public InProcessBrowserTest {
       return;
     }
 
-    ui_test_utils::DOMMessageQueue message_queue;
-    ui_test_utils::NavigateToURL(browser(), net::FilePathToFileURL(test_path_));
-    ui_test_utils::NavigateToURL(
-        browser(), GURL("javascript:start('" + url + "');"));
+    content::DOMMessageQueue message_queue;
+    content::NavigateToURL(shell(), net::FilePathToFileURL(test_path_));
 
     std::string message;
-    // Wait for message indicating the test has finished running.
+    content::NavigateToURL(shell(), GURL("javascript:start('" + url + "');"));
     ASSERT_TRUE(message_queue.WaitForMessage(&message));
+
     EXPECT_STREQ("\"SUCCESS\"", message.c_str()) << message;
   }
 
@@ -76,7 +78,7 @@ class WebGLConformanceTests : public InProcessBrowserTest {
 };
 
 #define CONFORMANCE_TEST(name, url) \
-IN_PROC_BROWSER_TEST_F(WebGLConformanceTests, name) { \
+IN_PROC_BROWSER_TEST_F(WebGLConformanceTests, MANUAL_##name) { \
   RunTest(url); \
 }
 
@@ -85,4 +87,4 @@ IN_PROC_BROWSER_TEST_F(WebGLConformanceTests, name) { \
 // See: generate_webgl_conformance_test_list.py
 #include "webgl_conformance_test_list_autogen.h"
 
-}  // namespace
+}  // namespace content