summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorzmo@chromium.org <zmo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-12 22:01:12 +0000
committerzmo@chromium.org <zmo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-12 22:01:12 +0000
commite000a99fa7bf760aa3f141a53a46bcd05be0e7c4 (patch)
tree6a4eebcecc15d003ee74be456dc13f2aafabeb61 /content
parent9ae18260efc7f2f774ab80b8487e47d2ddabcc90 (diff)
downloadchromium_src-e000a99fa7bf760aa3f141a53a46bcd05be0e7c4.zip
chromium_src-e000a99fa7bf760aa3f141a53a46bcd05be0e7c4.tar.gz
chromium_src-e000a99fa7bf760aa3f141a53a46bcd05be0e7c4.tar.bz2
Re-enable WebGL conformance tests on Win GPU bots.
So we confirmed the random crashes have nothing to do with the tests: the cause must be in the content browsertests harness. BUG=165269 TES=win gpu bots TBR=kbr Review URL: https://codereview.chromium.org/12221151 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@182030 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/browser/gpu/webgl_conformance_test.cc10
1 files changed, 0 insertions, 10 deletions
diff --git a/content/browser/gpu/webgl_conformance_test.cc b/content/browser/gpu/webgl_conformance_test.cc
index ef5c33d..c539f5c 100644
--- a/content/browser/gpu/webgl_conformance_test.cc
+++ b/content/browser/gpu/webgl_conformance_test.cc
@@ -2,7 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#if !defined(OS_WIN)
#include "base/command_line.h"
#include "base/file_util.h"
#include "base/path_service.h"
@@ -17,9 +16,6 @@
#include "content/test/gpu/gpu_test_config.h"
#include "content/test/gpu/gpu_test_expectations_parser.h"
#include "net/base/net_util.h"
-#else
-#include "content/test/content_browser_test.h"
-#endif
namespace content {
@@ -27,7 +23,6 @@ class WebGLConformanceTest : public ContentBrowserTest {
public:
WebGLConformanceTest() {}
-#if !defined(OS_WIN)
virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
// Allow privileged WebGL extensions.
command_line->AppendSwitch(switches::kEnablePrivilegedWebGLExtensions);
@@ -55,10 +50,8 @@ class WebGLConformanceTest : public ContentBrowserTest {
ASSERT_TRUE(test_expectations_.LoadTestExpectations(
GPUTestExpectationsParser::kWebGLConformanceTest));
}
-#endif
void RunTest(std::string url, std::string test_name) {
-#if !defined(OS_WIN)
int32 expectation =
test_expectations_.GetTestExpectation(test_name, bot_config_);
if (expectation != GPUTestExpectationsParser::kGpuTestPass) {
@@ -74,15 +67,12 @@ class WebGLConformanceTest : public ContentBrowserTest {
ASSERT_TRUE(message_queue.WaitForMessage(&message));
EXPECT_STREQ("\"SUCCESS\"", message.c_str()) << message;
-#endif
}
-#if !defined(OS_WIN)
private:
base::FilePath test_path_;
GPUTestBotConfig bot_config_;
GPUTestExpectationsParser test_expectations_;
-#endif
};
#define CONFORMANCE_TEST(name, url) \