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

Unified Diff: chrome/browser/extensions/extension_service_unittest.cc

Issue 1081403002: Refactor safe-browsing build-config definitions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase again to fix collision Created 5 years, 8 months 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 | « chrome/browser/extensions/blacklist.cc ('k') | chrome/browser/profiles/off_the_record_profile_io_data.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/extension_service_unittest.cc
diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc
index 43f31540123650ee5ce98f0ee71c82bc0de8361b..5911845c233ba4ed89c23523736ea8ca87967c8c 100644
--- a/chrome/browser/extensions/extension_service_unittest.cc
+++ b/chrome/browser/extensions/extension_service_unittest.cc
@@ -146,8 +146,8 @@
#include "chrome/browser/chromeos/settings/device_settings_service.h"
#endif
-// The blacklist tests rely on safe browsing.
-#if defined(FULL_SAFE_BROWSING) || defined(MOBILE_SAFE_BROWSING)
+// The blacklist tests rely on the safe-browsing database.
+#if defined(SAFE_BROWSING_DB_LOCAL)
#define ENABLE_BLACKLIST_TESTS
#endif
@@ -3631,7 +3631,6 @@ TEST_F(ExtensionServiceTest, ReloadBlacklistedExtension) {
EXPECT_EQ(StringSet(good1, good2),
registry()->blacklisted_extensions().GetIDs());
}
-
#endif // defined(ENABLE_BLACKLIST_TESTS)
// Tests blocking then unblocking enabled extensions after the service has been
« no previous file with comments | « chrome/browser/extensions/blacklist.cc ('k') | chrome/browser/profiles/off_the_record_profile_io_data.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698