Add the SocEng as a type for checking in CheckUrlForSubresourceFilter.

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 238 matching lines @@
       StoresToCheck({GetChromeExtMalwareId()}), extension_ids);
 
   return HandleCheck(std::move(check));
 }
 
 bool V4LocalDatabaseManager::CheckResourceUrl(const GURL& url, Client* client) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   StoresToCheck stores_to_check({GetChromeUrlClientIncidentId()});
 
-  if (!CanCheckUrl(url) || !AreStoresAvailableNow(stores_to_check)) {
+  if (!CanCheckUrl(url) || !AreAllStoresAvailableNow(stores_to_check)) {
     // Fail open: Mark resource as safe immediately.
     // TODO(nparker): This should queue the request if the DB isn't yet
     // loaded, and later decide if this store is available.
     // Currently this is the only store that requires full-hash-checks
     // AND isn't supported on Chromium, so it's unique.
     return true;
   }
 
   std::unique_ptr<PendingCheck> check = base::MakeUnique<PendingCheck>(
       client, ClientCallbackType::CHECK_RESOURCE_URL, stores_to_check,
       std::vector<GURL>(1, url));
 
   return HandleCheck(std::move(check));
 }
 
 bool V4LocalDatabaseManager::CheckUrlForSubresourceFilter(const GURL& url,
                                                           Client* client) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
-  StoresToCheck stores_to_check({GetUrlSubresourceFilterId()});
-  if (!AreStoresAvailableNow(stores_to_check) || !CanCheckUrl(url)) {
+  StoresToCheck stores_to_check(
+      {GetUrlSocEngId(), GetUrlSubresourceFilterId()});
+  if (!AreAnyStoresAvailableNow(stores_to_check) || !CanCheckUrl(url)) {
     return true;
   }
 
   std::unique_ptr<PendingCheck> check = base::MakeUnique<PendingCheck>(
       client, ClientCallbackType::CHECK_URL_FOR_SUBRESOURCE_FILTER,
       stores_to_check, std::vector<GURL>(1, url));
 
   return HandleCheck(std::move(check));
 }
 
 bool V4LocalDatabaseManager::MatchCsdWhitelistUrl(const GURL& url) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   StoresToCheck stores_to_check({GetUrlCsdWhitelistId()});
-  if (!AreStoresAvailableNow(stores_to_check)) {
+  if (!AreAllStoresAvailableNow(stores_to_check)) {
     // Fail open: Whitelist everything. Otherwise we may run the
     // CSD phishing/malware detector on popular domains and generate
     // undue load on the client and server. This has the effect of disabling
     // CSD phishing/malware detection until the store is first synced.
     return true;
   }
 
   return HandleUrlSynchronously(url, stores_to_check);
 }
 
 bool V4LocalDatabaseManager::MatchDownloadWhitelistString(
     const std::string& str) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   StoresToCheck stores_to_check({GetCertCsdDownloadWhitelistId()});
-  if (!AreStoresAvailableNow(stores_to_check)) {
+  if (!AreAllStoresAvailableNow(stores_to_check)) {
     // Fail close: Whitelist nothing. This may generate download-protection
     // pings for whitelisted binaries, but that's fine.
     return false;
   }
 
   return HandleHashSynchronously(str, stores_to_check);
 }
 
 bool V4LocalDatabaseManager::MatchDownloadWhitelistUrl(const GURL& url) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   StoresToCheck stores_to_check({GetUrlCsdDownloadWhitelistId()});
-  if (!AreStoresAvailableNow(stores_to_check)) {
+  if (!AreAllStoresAvailableNow(stores_to_check)) {
     // Fail close: Whitelist nothing. This may generate download-protection
     // pings for whitelisted domains, but that's fine.
     return false;
   }
 
   return HandleUrlSynchronously(url, stores_to_check);
 }
 
 bool V4LocalDatabaseManager::MatchMalwareIP(const std::string& ip_address) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   if (!enabled_ || !v4_database_) {
     return false;
   }
 
   FullHash hashed_encoded_ip;
   if (!V4ProtocolManagerUtil::IPAddressToEncodedIPV6Hash(ip_address,
                                                          &hashed_encoded_ip)) {
     return false;
   }
 
   return HandleHashSynchronously(hashed_encoded_ip,
                                  StoresToCheck({GetIpMalwareId()}));
 }
 
 bool V4LocalDatabaseManager::MatchModuleWhitelistString(
     const std::string& str) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   StoresToCheck stores_to_check({GetChromeFilenameClientIncidentId()});
-  if (!AreStoresAvailableNow(stores_to_check)) {
+  if (!AreAllStoresAvailableNow(stores_to_check)) {
     // Fail open: Whitelist everything.  This has the effect of marking
     // all DLLs as safe until the DB is synced and loaded.
     return true;
   }
 
   // str is the module's filename.  Convert to hash.
   FullHash hash = crypto::SHA256HashString(str);
   return HandleHashSynchronously(hash, stores_to_check);
 }
 
@@ skipping 385 matching lines @@
       extended_reporting_level_callback_);
 }
 
 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_);
 }
 
-bool V4LocalDatabaseManager::AreStoresAvailableNow(
+bool V4LocalDatabaseManager::AreAllStoresAvailableNow(
     const StoresToCheck& stores_to_check) const {
   return enabled_ && v4_database_ &&
-         v4_database_->AreStoresAvailable(stores_to_check);
+         v4_database_->AreAllStoresAvailable(stores_to_check);
+}
+
+bool V4LocalDatabaseManager::AreAnyStoresAvailableNow(
+    const StoresToCheck& stores_to_check) const {
+  return enabled_ && v4_database_ &&
+         v4_database_->AreAnyStoresAvailable(stores_to_check);
 }
 
 }  // namespace safe_browsing