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

Unified Diff: chrome/browser/safe_browsing/safe_browsing_util.cc

Issue 835523002: Add support for goog-csdinclusionwhite-sha256 in SafeBrowsingDatabase. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@##python_fix
Patch Set: fix tests post merge Created 5 years, 11 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/safe_browsing/safe_browsing_util.h ('k') | tools/metrics/histograms/histograms.xml » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 6d89445175373753478aecc97add8ac1d259639b..77aed1a25e6876ecc6d88ca943e700b8b613582e 100644
--- a/chrome/browser/safe_browsing/safe_browsing_util.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_util.cc
@@ -198,8 +198,9 @@ const char kExtensionBlacklist[] = "goog-badcrxids-digestvar";
const char kSideEffectFreeWhitelist[] = "goog-sideeffectfree-shavar";
const char kIPBlacklist[] = "goog-badip-digest256";
const char kUnwantedUrlList[] = "goog-unwanted-shavar";
+const char kInclusionWhitelist[] = "goog-csdinclusionwhite-sha256";
-const char* kAllLists[9] = {
+const char* kAllLists[10] = {
kMalwareList,
kPhishingList,
kBinUrlList,
@@ -209,6 +210,7 @@ const char* kAllLists[9] = {
kSideEffectFreeWhitelist,
kIPBlacklist,
kUnwantedUrlList,
+ kInclusionWhitelist,
};
ListType GetListId(const base::StringPiece& name) {
@@ -231,6 +233,8 @@ ListType GetListId(const base::StringPiece& name) {
id = IPBLACKLIST;
} else if (name == safe_browsing_util::kUnwantedUrlList) {
id = UNWANTEDURL;
+ } else if (name == safe_browsing_util::kInclusionWhitelist) {
+ id = INCLUSIONWHITELIST;
} else {
id = INVALID;
}
@@ -266,6 +270,9 @@ bool GetListName(ListType list_id, std::string* list) {
case UNWANTEDURL:
*list = safe_browsing_util::kUnwantedUrlList;
break;
+ case INCLUSIONWHITELIST:
+ *list = safe_browsing_util::kInclusionWhitelist;
+ break;
default:
return false;
}
« no previous file with comments | « chrome/browser/safe_browsing/safe_browsing_util.h ('k') | tools/metrics/histograms/histograms.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698