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

chrome/browser/safe_browsing/local_database_manager.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/safe_browsing/local_database_manager.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 88 matching lines @@
           if (index)
             *index = i;
           return threat;
         case UNWANTEDURL:
           // UNWANTEDURL is considered less severe than other threats, keep
           // looking.
           pending_threat = threat;
           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;
       }
     }
   }
   return pending_threat;
 }
 
 // Given a URL, compare all the possible host + path full hashes to the set of
 // provided full hashes.  Returns the list id of the severest matching result
 // from |full_hashes|, or INVALID if none match.
 ListType GetUrlSeverestThreatListType(
@@ skipping 21 matching lines @@
       case DOWNLOADWHITELIST:        // Falls through.
       case INCLUSIONWHITELIST:       // Falls through.
       case EXTENSIONBLACKLIST:       // Falls through.
       case IPBLACKLIST:
         return threat;
       case UNWANTEDURL:
         // UNWANTEDURL is considered less severe than other threats, keep
         // 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;
 }
 
 SBThreatType GetThreatTypeFromListType(ListType list_type) {
   switch (list_type) {
     case PHISH:
       return SB_THREAT_TYPE_URL_PHISHING;
     case MALWARE:
       return SB_THREAT_TYPE_URL_MALWARE;
     case UNWANTEDURL:
       return SB_THREAT_TYPE_URL_UNWANTED;
     case BINURL:
       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;
   }
 }
 
 }  // namespace
 
 // static
 SBThreatType LocalSafeBrowsingDatabaseManager::GetHashSeverestThreatType(
@@ skipping 84 matching lines @@
     const scoped_refptr<SafeBrowsingService>& service)
     : sb_service_(service),
       database_(NULL),
       enabled_(false),
       enable_download_protection_(false),
       enable_csd_whitelist_(false),
       enable_download_whitelist_(false),
       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),
       check_timeout_(base::TimeDelta::FromMilliseconds(kCheckTimeoutMs)) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   DCHECK(sb_service_.get() != NULL);
 
   base::CommandLine* cmdline = base::CommandLine::ForCurrentProcess();
   enable_download_protection_ =
       !cmdline->HasSwitch(switches::kSbDisableDownloadProtection);
@@ skipping 492 matching lines @@
   DCHECK(safe_browsing_task_runner_->RunsTasksOnCurrentThread());
 
   if (database_)
     return database_;
 
   const base::TimeTicks before = base::TimeTicks::Now();
   SafeBrowsingDatabase* database = SafeBrowsingDatabase::Create(
       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());
   {
     // Acquiring the lock here guarantees correct ordering between the writes to
     // the new database object above, and the setting of |database_| below.
     base::AutoLock lock(database_lock_);
     database_ = database;
   }
 
   BrowserThread::PostTask(
@@ skipping 408 matching lines @@
       FROM_HERE, base::Bind(&LocalSafeBrowsingDatabaseManager::TimeoutCallback,
                             check->weak_ptr_factory_->GetWeakPtr(), check),
       check_timeout_);
 }
 
 bool LocalSafeBrowsingDatabaseManager::download_protection_enabled() const {
   return enable_download_protection_;
 }
 
 }  // namespace safe_browsing