Index: chrome/browser/safe_browsing/safe_browsing_util.cc |
diff --git a/chrome/browser/safe_browsing/safe_browsing_util.cc b/chrome/browser/safe_browsing/safe_browsing_util.cc |
index bb2edf9a84414a7f9099cbd254741cdcd62121af..b8f86d25024d9538bafde45e409f2a1e872f2d80 100644 |
--- a/chrome/browser/safe_browsing/safe_browsing_util.cc |
+++ b/chrome/browser/safe_browsing/safe_browsing_util.cc |
@@ -189,16 +189,18 @@ const char kDownloadWhiteList[] = "goog-downloadwhite-digest256"; |
const char kExtensionBlacklist[] = "goog-badcrxids-digestvar"; |
const char kSideEffectFreeWhitelist[] = "goog-sideeffectfree-shavar"; |
const char kIPBlacklist[] = "goog-badip-digest256"; |
- |
-const char* kAllLists[8] = { |
- kMalwareList, |
- kPhishingList, |
- kBinUrlList, |
- kCsdWhiteList, |
- kDownloadWhiteList, |
- kExtensionBlacklist, |
- kSideEffectFreeWhitelist, |
- kIPBlacklist, |
+const char kUnwantedUrlList[] = "goog-unwanted-shavar"; |
+ |
+const char* kAllLists[9] = { |
+ kMalwareList, |
+ kPhishingList, |
+ kBinUrlList, |
+ kCsdWhiteList, |
+ kDownloadWhiteList, |
+ kExtensionBlacklist, |
+ kSideEffectFreeWhitelist, |
+ kIPBlacklist, |
+ kUnwantedUrlList, |
}; |
ListType GetListId(const base::StringPiece& name) { |
@@ -219,6 +221,8 @@ ListType GetListId(const base::StringPiece& name) { |
id = SIDEEFFECTFREEWHITELIST; |
} else if (name == safe_browsing_util::kIPBlacklist) { |
id = IPBLACKLIST; |
+ } else if (name == safe_browsing_util::kUnwantedUrlList) { |
+ id = UNWANTEDURL; |
} else { |
id = INVALID; |
} |
@@ -251,6 +255,9 @@ bool GetListName(ListType list_id, std::string* list) { |
case IPBLACKLIST: |
*list = safe_browsing_util::kIPBlacklist; |
break; |
+ case UNWANTEDURL: |
+ *list = safe_browsing_util::kUnwantedUrlList; |
+ break; |
default: |
return false; |
} |