Index: chrome/renderer/safe_browsing/phishing_classifier_browsertest.cc |
diff --git a/chrome/renderer/safe_browsing/phishing_classifier_browsertest.cc b/chrome/renderer/safe_browsing/phishing_classifier_browsertest.cc |
index c9c689b50b8f3e07bda92fdb918d1556967dfd1e..8c7409e9d5761fe35c6650b29b0da9055dd41aca 100644 |
--- a/chrome/renderer/safe_browsing/phishing_classifier_browsertest.cc |
+++ b/chrome/renderer/safe_browsing/phishing_classifier_browsertest.cc |
@@ -28,10 +28,6 @@ |
#include "testing/gmock/include/gmock/gmock.h" |
#include "url/gurl.h" |
-#if defined(OS_MACOSX) |
-#include "base/mac/mac_util.h" |
-#endif |
- |
using ::testing::AllOf; |
using ::testing::Contains; |
using ::testing::Not; |
@@ -272,15 +268,14 @@ IN_PROC_BROWSER_TEST_F(PhishingClassifierTest, TestClassification) { |
EXPECT_EQ(PhishingClassifier::kInvalidScore, phishy_score); |
} |
-IN_PROC_BROWSER_TEST_F(PhishingClassifierTest, DisableDetection) { |
+// This test flakes on Mac with force compositing mode for an unknown reason. |
+// http://crbug.com/316709 |
#if defined(OS_MACOSX) |
- if (base::mac::IsOSMountainLionOrLater()) { |
- // This test flakes on 10.8 only for an unknown reason. |
- // http://crbug.com/316709 |
- return; |
- } |
+#define MAYBE_DisableDetection DISABLED_DisableDetection |
+#else |
+#define MAYBE_DisableDetection DisableDetection |
#endif |
- |
+IN_PROC_BROWSER_TEST_F(PhishingClassifierTest, MAYBE_DisableDetection) { |
// No scorer yet, so the classifier is not ready. |
EXPECT_FALSE(classifier_->is_ready()); |