Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(96)

Unified Diff: chrome/renderer/safe_browsing/phishing_classifier_browsertest.cc

Issue 62333028: Remove blacklisting of Mac OS 10.6 and 10.7. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | content/browser/gpu/compositor_util_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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());
« no previous file with comments | « no previous file | content/browser/gpu/compositor_util_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698