diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-13 22:32:24 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-13 22:32:24 +0000 |
| commit | 8b6fe6e2fcabc0e61df5f7d8ef9df8e7bfa933b7 (patch) | |
| tree | f69ccf9a1838794ba6edc928c0d36f4fdf362017 | |
| parent | d1c8058f5704fa9f58c738e636858a0c8b32d425 (diff) | |
| download | chromium_src-8b6fe6e2fcabc0e61df5f7d8ef9df8e7bfa933b7.zip chromium_src-8b6fe6e2fcabc0e61df5f7d8ef9df8e7bfa933b7.tar.gz chromium_src-8b6fe6e2fcabc0e61df5f7d8ef9df8e7bfa933b7.tar.bz2 | |
Try enabling the phishing classifier browser tests that got disabled for bug 316709. I'd like to get some more data on which bots they fail on.
BUG=316709
R=ajwong@chromium.org
Review URL: https://codereview.chromium.org/61753012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@234932 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/renderer/safe_browsing/phishing_classifier_browsertest.cc | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/chrome/renderer/safe_browsing/phishing_classifier_browsertest.cc b/chrome/renderer/safe_browsing/phishing_classifier_browsertest.cc index d2f633c..831a8c8 100644 --- a/chrome/renderer/safe_browsing/phishing_classifier_browsertest.cc +++ b/chrome/renderer/safe_browsing/phishing_classifier_browsertest.cc @@ -198,13 +198,7 @@ class PhishingClassifierTest : public InProcessBrowserTest { }; // Flaky on Mac Blink bots: crbug.com/316709 -#if defined(OS_MACOSX) -#define MAYBE_TestClassification DISABLED_TestClassification -#else -#define MAYBE_TestClassification TestClassification -#endif - -IN_PROC_BROWSER_TEST_F(PhishingClassifierTest, MAYBE_TestClassification) { +IN_PROC_BROWSER_TEST_F(PhishingClassifierTest, TestClassification) { host_resolver()->AddRule("*", "127.0.0.1"); // No scorer yet, so the classifier is not ready. @@ -274,14 +268,7 @@ IN_PROC_BROWSER_TEST_F(PhishingClassifierTest, MAYBE_TestClassification) { EXPECT_EQ(PhishingClassifier::kInvalidScore, phishy_score); } -// Flaky on Mac Blink bots: crbug.com/316709 -#if defined(OS_MACOSX) -#define MAYBE_DisableDetection DISABLED_DisableDetection -#else -#define MAYBE_DisableDetection DisableDetection -#endif - -IN_PROC_BROWSER_TEST_F(PhishingClassifierTest, MAYBE_DisableDetection) { +IN_PROC_BROWSER_TEST_F(PhishingClassifierTest, DisableDetection) { // No scorer yet, so the classifier is not ready. EXPECT_FALSE(classifier_->is_ready()); |