Marking ErrorPageTest.IFrame404 as flaky on Windows builders, probably relate...

chrome/browser/errorpage_uitest.cc

 // Copyright (c) 2006-2008 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 "base/string_util.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/ui/ui_test.h"
 #include "chrome/browser/net/url_request_failed_dns_job.h"
 #include "chrome/browser/net/url_request_mock_http_job.h"
 #include "net/test/test_server.h"
@@ skipping 145 matching lines @@
                     FilePath(FILE_PATH_LITERAL("title2.html"))));
   NavigateToURL(URLRequestMockHTTPJob::GetMockUrl(
                     FilePath(FILE_PATH_LITERAL("iframe_dns_error.html"))));
 
   EXPECT_TRUE(GetActiveTab()->GoBack());
   EXPECT_TRUE(GetActiveTab()->GoForward());
 
   EXPECT_TRUE(WaitForTitleMatching(L"Blah"));
 }
 
-TEST_F(ErrorPageTest, IFrame404) {
+#if defined(OS_WIN)
+// Might be related to http://crbug.com/60937
+#define MAYBE_IFrame404 FLAKY_IFrame404
+#else
+#define MAYBE_IFrame404 IFrame404
+#endif
+
+TEST_F(ErrorPageTest, MAYBE_IFrame404) {
   // iframes that have 404 pages should not trigger an alternate error page.
   // In this test, the iframe sets the title of the parent page to "SUCCESS"
   // when the iframe loads.  If the iframe fails to load (because an alternate
   // error page loads instead), then the title will remain as "FAIL".
   net::TestServer test_server(net::TestServer::TYPE_HTTP,
                               FilePath(FILE_PATH_LITERAL("chrome/test/data")));
   ASSERT_TRUE(test_server.Start());
   NavigateToURL(test_server.GetURL("files/iframe404.html"));
   EXPECT_TRUE(WaitForTitleMatching(L"SUCCESS"));
 }
@@ skipping 17 matching lines @@
   // page.
   NavigateToURLBlockUntilNavigationsComplete(
       URLRequestMockHTTPJob::GetMockUrl(
           FilePath(FILE_PATH_LITERAL("page404.html"))), 2);
   EXPECT_TRUE(WaitForTitleMatching(L"Mock Link Doctor"));
 
   EXPECT_TRUE(GetActiveTab()->GoBack());
 
   EXPECT_TRUE(WaitForTitleMatching(L"Title Of Awesomeness"));
 }