Skip loading webgl test expectations on win gpu bots.

So we skip the tests in previous CL, and the random crashes still happen.  So it's apparent something else is causing it.

Try to see if loading the file is the cause of unexpected random crashes.

This is temporary and will be reverted once investigation is finished.

BUG=165269
TEST=win gpu bots
TBR=kbr
Review URL: https://codereview.chromium.org/12217092

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181547 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 4 deletions

diff --git a/content/browser/gpu/webgl_conformance_test.cc b/content/browser/gpu/webgl_conformance_test.cc
index faa1f34d..e3b669b 100644
--- a/content/browser/gpu/webgl_conformance_test.cc
+++ b/content/browser/gpu/webgl_conformance_test.cc
@@ -47,8 +47,10 @@ class WebGLConformanceTest : public ContentBrowserTest {
     ASSERT_TRUE(bot_config_.IsValid())
         << "Invalid bot configuration";
 
+#if !defined(OS_WIN)
     ASSERT_TRUE(test_expectations_.LoadTestExpectations(
         GPUTestExpectationsParser::kWebGLConformanceTest));
+#endif
   }
 
   void RunTest(const std::string& url) {
@@ -56,15 +58,14 @@ class WebGLConformanceTest : public ContentBrowserTest {
         testing::UnitTest::GetInstance()->current_test_info()->name();
     if (StartsWithASCII(test_name, "MANUAL_", true))
       test_name = test_name.substr(strlen("MANUAL_"));
+#if defined(OS_WIN)
+    return;
+#endif
     int32 expectation =
         test_expectations_.GetTestExpectation(test_name, bot_config_);
     if (expectation != GPUTestExpectationsParser::kGpuTestPass) {
       LOG(WARNING) << "Test " << test_name << " is bypassed";
       return;
-    } else {
-#if defined(OS_WIN)
-      return;
-#endif
     }
 
     DOMMessageQueue message_queue;