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

chrome/renderer/safe_browsing/phishing_classifier_browsertest.cc

 // Copyright (c) 2011 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 that although this is not a "browser" test, it runs as part of
 // browser_tests.  This is because WebKit does not work properly if it is
 // shutdown and re-initialized.  Since browser_tests runs each test in a
 // new process, this avoids the problem.
 
 #include "chrome/renderer/safe_browsing/phishing_classifier.h"
@@ skipping 114 matching lines @@
   // Features that are in the model.
   const std::string url_tld_token_net_;
   const std::string page_link_domain_phishing_;
   const std::string page_term_login_;
 
   // This member holds the status from the most recent call to the
   // ClassificationFinished callback.
   ClientPhishingRequest verdict_;
 };
 
-TEST_F(PhishingClassifierTest, DISABLED_TestClassification) {
+TEST_F(PhishingClassifierTest, TestClassification) {
   // No scorer yet, so the classifier is not ready.
   EXPECT_FALSE(classifier_->is_ready());
 
   // Now set the scorer.
   classifier_->set_phishing_scorer(scorer_.get());
   EXPECT_TRUE(classifier_->is_ready());
 
   // This test doesn't exercise the extraction timing.
   EXPECT_CALL(*clock_, Now())
       .WillRepeatedly(::testing::Return(base::TimeTicks::Now()));
@@ skipping 56 matching lines @@
   // Now set the scorer.
   classifier_->set_phishing_scorer(scorer_.get());
   EXPECT_TRUE(classifier_->is_ready());
 
   // Set a NULL scorer, which turns detection back off.
   classifier_->set_phishing_scorer(NULL);
   EXPECT_FALSE(classifier_->is_ready());
 }
 
 }  // namespace safe_browsing