Fix client-side phishing detection test flakiness and ChromeOS failure.

chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.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.
 //
 // Note: this test uses RenderViewFakeResourcesTest in order to set up a
 // real RenderThread to hold the phishing Scorer object.
 
 #include "chrome/renderer/safe_browsing/phishing_classifier_delegate.h"
 
 #include "base/memory/scoped_ptr.h"
@@ skipping 80 matching lines @@
   }
 
   void OnStartPhishingDetection(PhishingClassifierDelegate* delegate,
                                 const GURL& url) {
     delegate->OnStartPhishingDetection(url);
   }
 
   scoped_ptr<ClientPhishingRequest> verdict_;
 };
 
-TEST_F(PhishingClassifierDelegateTest, DISABLED_Navigation) {
+TEST_F(PhishingClassifierDelegateTest, Navigation) {
   MockPhishingClassifier* classifier =
       new StrictMock<MockPhishingClassifier>(view());
   PhishingClassifierDelegate* delegate =
       PhishingClassifierDelegate::Create(view(), classifier);
   MockScorer scorer;
   delegate->SetPhishingScorer(&scorer);
   ASSERT_TRUE(classifier->is_ready());
 
   // Test an initial load.  We expect classification to happen normally.
   EXPECT_CALL(*classifier, CancelPendingClassification()).Times(2);
@@ skipping 103 matching lines @@
   OnStartPhishingDetection(delegate, GURL("http://host.com/#foo2"));
   page_text = ASCIIToUTF16("dummy");
   EXPECT_CALL(*classifier, CancelPendingClassification());
   delegate->PageCaptured(&page_text, false);
   Mock::VerifyAndClearExpectations(classifier);
 
   // The delegate will cancel pending classification on destruction.
   EXPECT_CALL(*classifier, CancelPendingClassification());
 }
 
-TEST_F(PhishingClassifierDelegateTest, DISABLED_NoScorer) {
+TEST_F(PhishingClassifierDelegateTest, NoScorer) {
   // For this test, we'll create the delegate with no scorer available yet.
   MockPhishingClassifier* classifier =
       new StrictMock<MockPhishingClassifier>(view());
   PhishingClassifierDelegate* delegate =
       PhishingClassifierDelegate::Create(view(), classifier);
   ASSERT_FALSE(classifier->is_ready());
 
   // Queue up a pending classification, cancel it, then queue up another one.
   LoadURL("http://host.com/");
   string16 page_text = ASCIIToUTF16("dummy");
@@ skipping 16 matching lines @@
   // If we set a new scorer while a classification is going on the
   // classification should be cancelled.
   EXPECT_CALL(*classifier, CancelPendingClassification());
   delegate->SetPhishingScorer(&scorer);
   Mock::VerifyAndClearExpectations(classifier);
 
   // The delegate will cancel pending classification on destruction.
   EXPECT_CALL(*classifier, CancelPendingClassification());
 }
 
-TEST_F(PhishingClassifierDelegateTest, DISABLED_NoScorer_Ref) {
+TEST_F(PhishingClassifierDelegateTest, NoScorer_Ref) {
   // Similar to the last test, but navigates within the page before
   // setting the scorer.
   MockPhishingClassifier* classifier =
       new StrictMock<MockPhishingClassifier>(view());
   PhishingClassifierDelegate* delegate =
       PhishingClassifierDelegate::Create(view(), classifier);
   ASSERT_FALSE(classifier->is_ready());
 
   // Queue up a pending classification, cancel it, then queue up another one.
   LoadURL("http://host.com/");
@@ skipping 11 matching lines @@
   page_text = ASCIIToUTF16("dummy");
   EXPECT_CALL(*classifier, BeginClassification(Pointee(page_text), _));
   MockScorer scorer;
   delegate->SetPhishingScorer(&scorer);
   Mock::VerifyAndClearExpectations(classifier);
 
   // The delegate will cancel pending classification on destruction.
   EXPECT_CALL(*classifier, CancelPendingClassification());
 }
 
-TEST_F(PhishingClassifierDelegateTest, DISABLED_NoStartPhishingDetection) {
+TEST_F(PhishingClassifierDelegateTest, NoStartPhishingDetection) {
   // Tests the behavior when OnStartPhishingDetection has not yet been called
   // when the page load finishes.
   MockPhishingClassifier* classifier =
       new StrictMock<MockPhishingClassifier>(view());
   PhishingClassifierDelegate* delegate =
       PhishingClassifierDelegate::Create(view(), classifier);
   MockScorer scorer;
   delegate->SetPhishingScorer(&scorer);
   ASSERT_TRUE(classifier->is_ready());
 
@@ skipping 52 matching lines @@
     EXPECT_CALL(*classifier, CancelPendingClassification());
     EXPECT_CALL(*classifier, BeginClassification(Pointee(page_text), _));
     delegate->PageCaptured(&page_text, false);
     Mock::VerifyAndClearExpectations(classifier);
   }
 
   // The delegate will cancel pending classification on destruction.
   EXPECT_CALL(*classifier, CancelPendingClassification());
 }
 
-TEST_F(PhishingClassifierDelegateTest, DISABLED_IgnorePreliminaryCapture) {
+TEST_F(PhishingClassifierDelegateTest, IgnorePreliminaryCapture) {
   // Tests that preliminary PageCaptured notifications are ignored.
   MockPhishingClassifier* classifier =
       new StrictMock<MockPhishingClassifier>(view());
   PhishingClassifierDelegate* delegate =
       PhishingClassifierDelegate::Create(view(), classifier);
   MockScorer scorer;
   delegate->SetPhishingScorer(&scorer);
   ASSERT_TRUE(classifier->is_ready());
 
   EXPECT_CALL(*classifier, CancelPendingClassification());
@@ skipping 11 matching lines @@
     EXPECT_CALL(*classifier, CancelPendingClassification());
     EXPECT_CALL(*classifier, BeginClassification(Pointee(page_text), _));
     delegate->PageCaptured(&page_text, false);
     Mock::VerifyAndClearExpectations(classifier);
   }
 
   // The delegate will cancel pending classification on destruction.
   EXPECT_CALL(*classifier, CancelPendingClassification());
 }
 
-TEST_F(PhishingClassifierDelegateTest, DISABLED_DuplicatePageCapture) {
+TEST_F(PhishingClassifierDelegateTest, DuplicatePageCapture) {
   // Tests that a second PageCaptured notification causes classification to
   // be cancelled.
   MockPhishingClassifier* classifier =
       new StrictMock<MockPhishingClassifier>(view());
   PhishingClassifierDelegate* delegate =
       PhishingClassifierDelegate::Create(view(), classifier);
   MockScorer scorer;
   delegate->SetPhishingScorer(&scorer);
   ASSERT_TRUE(classifier->is_ready());
 
@@ skipping 13 matching lines @@
 
   page_text = ASCIIToUTF16("phish");
   EXPECT_CALL(*classifier, CancelPendingClassification());
   delegate->PageCaptured(&page_text, false);
   Mock::VerifyAndClearExpectations(classifier);
 
   // The delegate will cancel pending classification on destruction.
   EXPECT_CALL(*classifier, CancelPendingClassification());
 }
 
-TEST_F(PhishingClassifierDelegateTest, DISABLED_PhishingDetectionDone) {
+TEST_F(PhishingClassifierDelegateTest, PhishingDetectionDone) {
   // Tests that a PhishingDetectionDone IPC is sent to the browser
   // whenever we finish classification.
   MockPhishingClassifier* classifier =
       new StrictMock<MockPhishingClassifier>(view());
   PhishingClassifierDelegate* delegate =
       PhishingClassifierDelegate::Create(view(), classifier);
   MockScorer scorer;
   delegate->SetPhishingScorer(&scorer);
   ASSERT_TRUE(classifier->is_ready());
 
@@ skipping 19 matching lines @@
   verdict.set_is_phishing(false);  // Send IPC even if site is not phishing.
   RunClassificationDone(delegate, verdict);
   ASSERT_TRUE(verdict_.get());
   EXPECT_EQ(verdict.SerializeAsString(), verdict_->SerializeAsString());
 
   // The delegate will cancel pending classification on destruction.
   EXPECT_CALL(*classifier, CancelPendingClassification());
 }
 
 }  // namespace safe_browsing