Revert 217722 "[Sheriff] Disable SafeBrowsingBlockingPageTest.Ma..."

trunk/src/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc

 // Copyright (c) 2012 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.
 //
 // This test creates a fake safebrowsing service, where we can inject
 // malware and phishing urls.  It then uses a real browser to go to
 // these urls, and sends "goback" or "proceed" commands and verifies
 // they work.
 
 #include "base/bind.h"
@@ skipping 689 matching lines @@
 IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest, MalwareIframeProceed) {
   GURL url = SetupMalwareIframeWarningAndNavigate();
 
   EXPECT_TRUE(ClickAndWaitForDetach("proceed"));
   AssertNoInterstitial(true);  // Assert the interstitial is gone
 
   EXPECT_EQ(url,
             browser()->tab_strip_model()->GetActiveWebContents()->GetURL());
 }
 
-// Disabled on Win Aura because it is flaky: crbug.com/273302.
-#if defined(OS_WIN) && defined(USE_AURA)
-#define MAYBE_SafeBrowsingBlockingPageTest DISABLED_SafeBrowsingBlockingPageTest
-#else
-#define MAYBE_SafeBrowsingBlockingPageTest SafeBrowsingBlockingPageTest
-#endif
-IN_PROC_BROWSER_TEST_F(MAYBE_SafeBrowsingBlockingPageTest,
+IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest,
                        MalwareIframeReportDetails) {
   GURL url = SetupMalwareIframeWarningAndNavigate();
 
   // If the DOM details from renderer did not already return, wait for them.
   details_factory_.get_details()->WaitForDOM();
 
   EXPECT_TRUE(Click("check-report"));
 
   EXPECT_TRUE(ClickAndWaitForDetach("proceed"));
   AssertNoInterstitial(true);  // Assert the interstitial is gone
@@ skipping 142 matching lines @@
   SetupWarningAndNavigate(SB_THREAT_TYPE_URL_PHISHING);
 
   EXPECT_TRUE(ClickAndWaitForDetach("learn-more-link"));
   AssertNoInterstitial(false);  // Assert the interstitial is gone
 
   // We are in the help page.
   EXPECT_EQ(
       "/goodtoknow/online-safety/phishing/",
        browser()->tab_strip_model()->GetActiveWebContents()->GetURL().path());
 }