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

chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc

Index: chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc
diff --git a/chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc b/chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc
index 7390400063edaf1eddd857912e825dcffcc6c5db..671327eadb2914bd7187ad57908b1c5eff2d573d 100644
--- a/chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc
+++ b/chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc
@@ -98,7 +98,7 @@ class PhishingClassifierDelegateTest : public RenderViewFakeResourcesTest {
   scoped_ptr<ClientPhishingRequest> verdict_;
 };
 
-TEST_F(PhishingClassifierDelegateTest, DISABLED_Navigation) {
+TEST_F(PhishingClassifierDelegateTest, Navigation) {
   MockPhishingClassifier* classifier =
       new StrictMock<MockPhishingClassifier>(view());
   PhishingClassifierDelegate* delegate =
@@ -222,7 +222,7 @@ TEST_F(PhishingClassifierDelegateTest, DISABLED_Navigation) {
   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());
@@ -259,7 +259,7 @@ TEST_F(PhishingClassifierDelegateTest, DISABLED_NoScorer) {
   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 =
@@ -291,7 +291,7 @@ TEST_F(PhishingClassifierDelegateTest, DISABLED_NoScorer_Ref) {
   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 =
@@ -364,7 +364,7 @@ TEST_F(PhishingClassifierDelegateTest, DISABLED_NoStartPhishingDetection) {
   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());
@@ -396,7 +396,7 @@ TEST_F(PhishingClassifierDelegateTest, DISABLED_IgnorePreliminaryCapture) {
   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 =
@@ -430,7 +430,7 @@ TEST_F(PhishingClassifierDelegateTest, DISABLED_DuplicatePageCapture) {
   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 =