Re-enable ClientSideDetectionHostTest.* now that crbug.com/313141 is fixed.

BUG=299149

Review URL: https://codereview.chromium.org/61403004

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

chrome/browser/safe_browsing/client_side_detection_host_unittest.cc

@@ -329,13 +329,7 @@ class ClientSideDetectionHostTest : public ChromeRenderViewHostTestHarness {
   MockTestingProfile* mock_profile_;  // We don't own this object
 };
 
-#if defined(OS_WIN)
-// Crashes on Blink canary bots: http://crbug.com/299149
-TEST_F(ClientSideDetectionHostTest,
-       DISABLED_OnPhishingDetectionDoneInvalidVerdict) {
-#else
 TEST_F(ClientSideDetectionHostTest, OnPhishingDetectionDoneInvalidVerdict) {
-#endif
   // Case 0: renderer sends an invalid verdict string that we're unable to
   // parse.
   MockBrowserFeatureExtractor* mock_extractor =
@@ -348,13 +342,7 @@ TEST_F(ClientSideDetectionHostTest, OnPhishingDetectionDoneInvalidVerdict) {
   EXPECT_TRUE(Mock::VerifyAndClear(mock_extractor));
 }
 
-#if defined(OS_WIN)
-// Fails on Blink canary bots: http://crbug.com/299149
-TEST_F(ClientSideDetectionHostTest,
-       DISABLED_OnPhishingDetectionDoneNotPhishing) {
-#else
 TEST_F(ClientSideDetectionHostTest, OnPhishingDetectionDoneNotPhishing) {
-#endif
   // Case 1: client thinks the page is phishing.  The server does not agree.
   // No interstitial is shown.
   MockBrowserFeatureExtractor* mock_extractor =
@@ -391,12 +379,7 @@ TEST_F(ClientSideDetectionHostTest, OnPhishingDetectionDoneNotPhishing) {
   EXPECT_TRUE(Mock::VerifyAndClear(ui_manager_.get()));
 }
 
-#if defined(OS_WIN)
-// Fails on Blink canary bots: http://crbug.com/299149
-TEST_F(ClientSideDetectionHostTest, DISABLED_OnPhishingDetectionDoneDisabled) {
-#else
 TEST_F(ClientSideDetectionHostTest, OnPhishingDetectionDoneDisabled) {
-#endif
   // Case 2: client thinks the page is phishing and so does the server but
   // showing the interstitial is disabled => no interstitial is shown.
   MockBrowserFeatureExtractor* mock_extractor =
@@ -437,13 +420,7 @@ TEST_F(ClientSideDetectionHostTest, OnPhishingDetectionDoneDisabled) {
   EXPECT_TRUE(Mock::VerifyAndClear(ui_manager_.get()));
 }
 
-#if defined(OS_WIN)
-// Fails on Blink canary bots: http://crbug.com/299149
-TEST_F(ClientSideDetectionHostTest,
-       DISABLED_OnPhishingDetectionDoneShowInterstitial) {
-#else
 TEST_F(ClientSideDetectionHostTest, OnPhishingDetectionDoneShowInterstitial) {
-#endif
   // Case 3: client thinks the page is phishing and so does the server.
   // We show an interstitial.
   MockBrowserFeatureExtractor* mock_extractor =
@@ -500,13 +477,7 @@ TEST_F(ClientSideDetectionHostTest, OnPhishingDetectionDoneShowInterstitial) {
                  ui_manager_, resource.callback));
 }
 
-#if defined(OS_WIN)
-// Fails on Blink canary bots: http://crbug.com/299149
-TEST_F(ClientSideDetectionHostTest,
-       DISABLED_OnPhishingDetectionDoneMultiplePings) {
-#else
 TEST_F(ClientSideDetectionHostTest, OnPhishingDetectionDoneMultiplePings) {
-#endif
   // Case 4 & 5: client thinks a page is phishing then navigates to
   // another page which is also considered phishing by the client
   // before the server responds with a verdict.  After a while the
@@ -601,14 +572,8 @@ TEST_F(ClientSideDetectionHostTest, OnPhishingDetectionDoneMultiplePings) {
                  ui_manager_, resource.callback));
 }
 
-#if defined(OS_WIN)
-// Fails on Blink canary bots: http://crbug.com/299149
-TEST_F(ClientSideDetectionHostTest,
-       DISABLED_OnPhishingDetectionDoneVerdictNotPhishing) {
-#else
 TEST_F(ClientSideDetectionHostTest,
        OnPhishingDetectionDoneVerdictNotPhishing) {
-#endif
   // Case 6: renderer sends a verdict string that isn't phishing.
   MockBrowserFeatureExtractor* mock_extractor =
       new StrictMock<MockBrowserFeatureExtractor>(
@@ -631,14 +596,8 @@ TEST_F(ClientSideDetectionHostTest,
   EXPECT_TRUE(Mock::VerifyAndClear(mock_extractor));
 }
 
-#if defined(OS_WIN)
-// Fails on Blink canary bots: http://crbug.com/299149
-TEST_F(ClientSideDetectionHostTest,
-       DISABLED_OnPhishingDetectionDoneVerdictNotPhishingButSBMatch) {
-#else
 TEST_F(ClientSideDetectionHostTest,
        OnPhishingDetectionDoneVerdictNotPhishingButSBMatch) {
-#endif
   // Case 7: renderer sends a verdict string that isn't phishing but the URL
   // was on the regular phishing or malware lists.
   GURL url("http://not-phishing.com/");
@@ -666,12 +625,7 @@ TEST_F(ClientSideDetectionHostTest,
   EXPECT_TRUE(Mock::VerifyAndClear(csd_host_.get()));
 }
 
-#if defined(OS_WIN)
-// Crashes on Blink canary bots: http://crbug.com/299149
-TEST_F(ClientSideDetectionHostTest, DISABLED_UpdateIPUrlMap) {
-#else
 TEST_F(ClientSideDetectionHostTest, UpdateIPUrlMap) {
-#endif
   BrowseInfo* browse_info = GetBrowseInfo();
 
   // Empty IP or host are skipped
@@ -724,14 +678,8 @@ TEST_F(ClientSideDetectionHostTest, UpdateIPUrlMap) {
   EXPECT_EQ(expected_urls, browse_info->ips["100.100.100.256"]);
 }
 
-#if defined(OS_WIN)
-// Crashes on Blink canary bots: http://crbug.com/299149
-TEST_F(ClientSideDetectionHostTest,
-       DISABLED_OnPhishingDetectionDoneVerdictNotPhishingNotMalwareIP) {
-#else
 TEST_F(ClientSideDetectionHostTest,
        OnPhishingDetectionDoneVerdictNotPhishingNotMalwareIP) {
-#endif
   // Case 7: renderer sends a verdict string that isn't phishing and not matches
   // malware bad IP list
   MockBrowserFeatureExtractor* mock_extractor =
@@ -760,14 +708,8 @@ TEST_F(ClientSideDetectionHostTest,
   EXPECT_TRUE(Mock::VerifyAndClear(mock_extractor));
 }
 
-#if defined(OS_WIN)
-// Crashes on Blink canary bots: http://crbug.com/299149
-TEST_F(ClientSideDetectionHostTest,
-       DISABLED_OnPhishingDetectionDoneVerdictNotPhishingButMalwareIP) {
-#else
 TEST_F(ClientSideDetectionHostTest,
        OnPhishingDetectionDoneVerdictNotPhishingButMalwareIP) {
-#endif
   // Case 8: renderer sends a verdict string that isn't phishing but matches
   // malware bad IP list
   MockBrowserFeatureExtractor* mock_extractor =
@@ -800,14 +742,8 @@ TEST_F(ClientSideDetectionHostTest,
   EXPECT_TRUE(Mock::VerifyAndClear(mock_extractor));
 }
 
-#if defined(OS_WIN)
-// Crashes on Blink canary bots: http://crbug.com/299149
-TEST_F(ClientSideDetectionHostTest,
-       DISABLED_OnPhishingDetectionDoneVerdictPhishingAndMalwareIP) {
-#else
 TEST_F(ClientSideDetectionHostTest,
        OnPhishingDetectionDoneVerdictPhishingAndMalwareIP) {
-#endif
   // Case 9: renderer sends a verdict string that is phishing and matches
   // malware bad IP list
   MockBrowserFeatureExtractor* mock_extractor =
@@ -851,14 +787,8 @@ TEST_F(ClientSideDetectionHostTest,
   ASSERT_FALSE(cb.is_null());
 }
 
-#if defined(OS_WIN)
-// Crashes on Blink canary bots: http://crbug.com/299149
-TEST_F(ClientSideDetectionHostTest,
-       DISABLED_OnPhishingDetectionDoneShowMalwareInterstitial) {
-#else
 TEST_F(ClientSideDetectionHostTest,
        OnPhishingDetectionDoneShowMalwareInterstitial) {
-#endif
   // Case 10: client thinks the page match malware IP and so does the server.
   // We show an sub-resource malware interstitial.
   MockBrowserFeatureExtractor* mock_extractor =
@@ -917,13 +847,7 @@ TEST_F(ClientSideDetectionHostTest,
                  ui_manager_, resource.callback));
 }
 
-#if defined(OS_WIN)
-// Crashes on Blink canary bots: http://crbug.com/299149
-TEST_F(ClientSideDetectionHostTest,
-       DISABLED_NavigationCancelsShouldClassifyUrl) {
-#else
 TEST_F(ClientSideDetectionHostTest, NavigationCancelsShouldClassifyUrl) {
-#endif
   // Test that canceling pending should classify requests works as expected.
 
   GURL first_url("http://first.phishy.url.com");
@@ -948,12 +872,7 @@ TEST_F(ClientSideDetectionHostTest, NavigationCancelsShouldClassifyUrl) {
   WaitAndCheckPreClassificationChecks();
 }
 
-#if defined(OS_WIN)
-// Crashes on Blink canary bots: http://crbug.com/299149
-TEST_F(ClientSideDetectionHostTest, DISABLED_ShouldClassifyUrl) {
-#else
 TEST_F(ClientSideDetectionHostTest, ShouldClassifyUrl) {
-#endif
   // Navigate the tab to a page.  We should see a StartPhishingDetection IPC.
   GURL url("http://host.com/");
   ExpectPreClassificationChecks(url, &kFalse, &kFalse, &kFalse, &kFalse,