V4Only: In V4Only mode use PVer4 for all SafeBrowsing operations

components/safe_browsing_db/v4_local_database_manager.cc

 // Copyright 2016 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.
 
 // This file should not be build on Android but is currently getting built.
 // TODO(vakh): Fix that: http://crbug.com/621647
 
 #include "components/safe_browsing_db/v4_local_database_manager.h"
 
 #include <vector>
@@ skipping 63 matching lines @@
       ListInfo(kSyncNever, "", GetChromeUrlApiId(), SB_THREAT_TYPE_API_ABUSE),
   });
 }
 
 // Returns the severity information about a given SafeBrowsing list. The lowest
 // value is 0, which represents the most severe list.
 ThreatSeverity GetThreatSeverity(const ListIdentifier& list_id) {
   switch (list_id.threat_type()) {
     case MALWARE_THREAT:
     case SOCIAL_ENGINEERING_PUBLIC:
+    case MALICIOUS_BINARY:
       return 0;
     case UNWANTED_SOFTWARE:
       return 1;
     case API_ABUSE:
       return 2;
     default:
-      NOTREACHED() << "Unexpected ThreatType encountered in GetThreatSeverity";
+      NOTREACHED() << "Unexpected ThreatType encountered: "
+                   << list_id.threat_type();
       return kLeastSeverity;
   }
 }
 
 }  // namespace
 
 V4LocalDatabaseManager::PendingCheck::PendingCheck(
     Client* client,
     ClientCallbackType client_callback_type,
     const StoresToCheck& stores_to_check,
@@ skipping 327 matching lines @@
     const std::unique_ptr<PendingCheck>& check,
     FullHashToStoreAndHashPrefixesMap* full_hash_to_store_and_hash_prefixes) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   DCHECK(enabled_);
   DCHECK(v4_database_);
 
   const base::TimeTicks before = TimeTicks::Now();
   if (check->client_callback_type == ClientCallbackType::CHECK_BROWSE_URL ||
       check->client_callback_type == ClientCallbackType::CHECK_DOWNLOAD_URLS ||
+      check->client_callback_type == ClientCallbackType::CHECK_RESOURCE_URL ||
       check->client_callback_type == ClientCallbackType::CHECK_EXTENSION_IDS ||
       check->client_callback_type == ClientCallbackType::CHECK_OTHER) {
     DCHECK(!check->full_hashes.empty());
 
     full_hash_to_store_and_hash_prefixes->clear();
     for (const auto& full_hash : check->full_hashes) {
       StoreAndHashPrefixes matched_store_and_hash_prefixes;
       v4_database_->GetStoresMatchingFullHash(full_hash, check->stores_to_check,
                                               &matched_store_and_hash_prefixes);
       if (!matched_store_and_hash_prefixes.empty()) {
         (*full_hash_to_store_and_hash_prefixes)[full_hash] =
             matched_store_and_hash_prefixes;
       }
     }
   } else {
-    NOTREACHED() << "Unexpected client_callback_type encountered";
+    NOTREACHED() << "Unexpected client_callback_type encountered.";
   }
 
   // TODO(vakh): Only log SafeBrowsing.V4GetPrefixMatches.Time once PVer3 code
   // is removed.
   // NOTE(vakh): This doesn't distinguish which stores it's searching through.
   // However, the vast majority of the entries in this histogram will be from
   // searching the three CHECK_BROWSE_URL stores.
   base::TimeDelta diff = TimeTicks::Now() - before;
   UMA_HISTOGRAM_TIMES("SB2.FilterCheck", diff);
   UMA_HISTOGRAM_CUSTOM_TIMES("SafeBrowsing.V4GetPrefixMatches.Time", diff,
@@ skipping 210 matching lines @@
 }
 
 void V4LocalDatabaseManager::UpdateRequestCompleted(
     std::unique_ptr<ParsedServerResponse> parsed_server_response) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   v4_database_->ApplyUpdate(std::move(parsed_server_response),
                             db_updated_callback_);
 }
 
 }  // namespace safe_browsing