| 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 aff62a0d618e652a730d0fed9b5febfcf1ff4c80..ff34605d537e7632f8d98d832265f276e8b8b896 100644
|
| --- a/chrome/browser/safe_browsing/safe_browsing_util.cc
|
| +++ b/chrome/browser/safe_browsing/safe_browsing_util.cc
|
| @@ -169,23 +169,18 @@ namespace safe_browsing_util {
|
| const char kMalwareList[] = "goog-malware-shavar";
|
| const char kPhishingList[] = "goog-phish-shavar";
|
| const char kBinUrlList[] = "goog-badbinurl-shavar";
|
| -// We don't use the bad binary digest list anymore. Use a fake listname to be
|
| -// sure we don't request it accidentally.
|
| -const char kBinHashList[] = "goog-badbin-digestvar-disabled";
|
| const char kCsdWhiteList[] = "goog-csdwhite-sha256";
|
| 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[10] = {
|
| +const char* kAllLists[8] = {
|
| kMalwareList,
|
| kPhishingList,
|
| kBinUrlList,
|
| - kBinHashList,
|
| kCsdWhiteList,
|
| kDownloadWhiteList,
|
| - kDownloadWhiteList,
|
| kExtensionBlacklist,
|
| kSideEffectFreeWhitelist,
|
| kIPBlacklist,
|
| @@ -199,8 +194,6 @@ ListType GetListId(const std::string& name) {
|
| id = PHISH;
|
| } else if (name == safe_browsing_util::kBinUrlList) {
|
| id = BINURL;
|
| - } else if (name == safe_browsing_util::kBinHashList) {
|
| - id = BINHASH;
|
| } else if (name == safe_browsing_util::kCsdWhiteList) {
|
| id = CSDWHITELIST;
|
| } else if (name == safe_browsing_util::kDownloadWhiteList) {
|
| @@ -228,9 +221,6 @@ bool GetListName(ListType list_id, std::string* list) {
|
| case BINURL:
|
| *list = safe_browsing_util::kBinUrlList;
|
| break;
|
| - case BINHASH:
|
| - *list = safe_browsing_util::kBinHashList;
|
| - break;
|
| case CSDWHITELIST:
|
| *list = safe_browsing_util::kCsdWhiteList;
|
| break;
|
| @@ -511,10 +501,6 @@ bool IsBadbinurlList(const std::string& list_name) {
|
| return list_name.compare(kBinUrlList) == 0;
|
| }
|
|
|
| -bool IsBadbinhashList(const std::string& list_name) {
|
| - return list_name.compare(kBinHashList) == 0;
|
| -}
|
| -
|
| bool IsExtensionList(const std::string& list_name) {
|
| return list_name.compare(kExtensionBlacklist) == 0;
|
| }
|
|
|