Support new Safe Browsing list "goog-badresource-shavar" in SafeBrowsingDatabase.

chrome/browser/safe_browsing/local_database_manager.cc

Index: chrome/browser/safe_browsing/local_database_manager.cc
diff --git a/chrome/browser/safe_browsing/local_database_manager.cc b/chrome/browser/safe_browsing/local_database_manager.cc
index 19e52ca72ff171f624cafd0184990a556e785391..095aae8c01b5bf686b666da91fd7551b425c26c3 100644
--- a/chrome/browser/safe_browsing/local_database_manager.cc
+++ b/chrome/browser/safe_browsing/local_database_manager.cc
@@ -106,6 +106,14 @@ ListType GetHashSeverestThreatListType(
           if (index)
             *index = i;
           break;
+        case RESOURCEBLACKLIST:
+          // RESOURCEBLACKLIST is even less severe than UNWANTEDURL.
+          if (pending_threat == INVALID) {
+            pending_threat = threat;
+            if (index)
+              *index = i;
+          }
+          break;
       }
     }
   }
@@ -147,6 +155,12 @@ ListType GetUrlSeverestThreatListType(
         // looking.
         pending_threat = threat;
         break;
+      case RESOURCEBLACKLIST:
+        // RESOURCEBLACKLIST is even less severe than UNWANTEDURL.
+        if (pending_threat == INVALID) {
+          pending_threat = threat;
+        }
+        break;
     }
   }
   return pending_threat;
@@ -164,6 +178,8 @@ SBThreatType GetThreatTypeFromListType(ListType list_type) {
       return SB_THREAT_TYPE_BINARY_MALWARE_URL;
     case EXTENSIONBLACKLIST:
       return SB_THREAT_TYPE_EXTENSION;
+    case RESOURCEBLACKLIST:
+      return SB_THREAT_TYPE_BLACKLISTED_RESOURCE;
     default:
       DVLOG(1) << "Unknown safe browsing list id " << list_type;
       return SB_THREAT_TYPE_SAFE;
@@ -268,6 +284,7 @@ LocalSafeBrowsingDatabaseManager::LocalSafeBrowsingDatabaseManager(
       enable_extension_blacklist_(false),
       enable_ip_blacklist_(false),
       enable_unwanted_software_blacklist_(true),
+      enable_resource_blacklist_(true),
       update_in_progress_(false),
       database_update_in_progress_(false),
       closing_database_(false),
@@ -780,7 +797,8 @@ SafeBrowsingDatabase* LocalSafeBrowsingDatabaseManager::GetDatabase() {
       safe_browsing_task_runner_, enable_download_protection_,
       enable_csd_whitelist_, enable_download_whitelist_,
       enable_extension_blacklist_, enable_ip_blacklist_,
-      enable_unwanted_software_blacklist_);
+      enable_unwanted_software_blacklist_,
+      enable_resource_blacklist_);
 
   database->Init(SafeBrowsingService::GetBaseFilename());
   {