Remove PrerenderLocalPredictor, part 2.

chrome/browser/safe_browsing/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/database_manager.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 71 matching lines @@
           // |full_hashes| should never contain INVALID as a |list_id|.
           NOTREACHED();
           break;
         case safe_browsing_util::MALWARE:                  // Falls through.
         case safe_browsing_util::PHISH:                    // Falls through.
         case safe_browsing_util::BINURL:                   // Falls through.
         case safe_browsing_util::CSDWHITELIST:             // Falls through.
         case safe_browsing_util::DOWNLOADWHITELIST:        // Falls through.
         case safe_browsing_util::INCLUSIONWHITELIST:       // Falls through.
         case safe_browsing_util::EXTENSIONBLACKLIST:       // Falls through.
-        case safe_browsing_util::SIDEEFFECTFREEWHITELIST:  // Falls through.
         case safe_browsing_util::IPBLACKLIST:
           if (index)
             *index = i;
           return threat;
         case safe_browsing_util::UNWANTEDURL:
           // UNWANTEDURL is considered less severe than other threats, keep
           // looking.
           pending_threat = threat;
           if (index)
             *index = i;
@@ skipping 25 matching lines @@
       case safe_browsing_util::INVALID:
         // Ignore patterns with no matching threat.
         break;
       case safe_browsing_util::MALWARE:                  // Falls through.
       case safe_browsing_util::PHISH:                    // Falls through.
       case safe_browsing_util::BINURL:                   // Falls through.
       case safe_browsing_util::CSDWHITELIST:             // Falls through.
       case safe_browsing_util::DOWNLOADWHITELIST:        // Falls through.
       case safe_browsing_util::INCLUSIONWHITELIST:       // Falls through.
       case safe_browsing_util::EXTENSIONBLACKLIST:       // Falls through.
-      case safe_browsing_util::SIDEEFFECTFREEWHITELIST:  // Falls through.
       case safe_browsing_util::IPBLACKLIST:
         return threat;
       case safe_browsing_util::UNWANTEDURL:
         // UNWANTEDURL is considered less severe than other threats, keep
         // looking.
         pending_threat = threat;
         break;
     }
   }
   return pending_threat;
@@ skipping 106 matching lines @@
 
 SafeBrowsingDatabaseManager::SafeBrowsingDatabaseManager(
     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_side_effect_free_whitelist_(false),
       enable_ip_blacklist_(false),
       enable_unwanted_software_blacklist_(false),
       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);
 
   // Android only supports a subset of FULL_SAFE_BROWSING.
@@ skipping 11 matching lines @@
   // TODO(noelutz): remove this boolean variable since it should always be true
   // if SafeBrowsing is enabled.  Unfortunately, we have no test data for this
   // list right now.  This means that we need to be able to disable this list
   // for the SafeBrowsing test to pass.
   enable_download_whitelist_ = enable_csd_whitelist_;
 
   // TODO(kalman): there really shouldn't be a flag for this.
   enable_extension_blacklist_ =
       !cmdline->HasSwitch(switches::kSbDisableExtensionBlacklist);
 
-  enable_side_effect_free_whitelist_ =
-      prerender::IsSideEffectFreeWhitelistEnabled() &&
-      !cmdline->HasSwitch(switches::kSbDisableSideEffectFreeWhitelist);
-
   // The client-side IP blacklist feature is tightly integrated with client-side
   // phishing protection for now.
   enable_ip_blacklist_ = enable_csd_whitelist_;
 
   // The UwS blacklist feature is controlled by a flag for M40.
   enable_unwanted_software_blacklist_ =
       safe_browsing_util::GetUnwantedTrialGroup() > safe_browsing_util::UWS_OFF;
-
-  enum SideEffectFreeWhitelistStatus {
-    SIDE_EFFECT_FREE_WHITELIST_ENABLED,
-    SIDE_EFFECT_FREE_WHITELIST_DISABLED,
-    SIDE_EFFECT_FREE_WHITELIST_STATUS_MAX
-  };
-
-  SideEffectFreeWhitelistStatus side_effect_free_whitelist_status =
-      enable_side_effect_free_whitelist_ ? SIDE_EFFECT_FREE_WHITELIST_ENABLED :
-      SIDE_EFFECT_FREE_WHITELIST_DISABLED;
-
-  UMA_HISTOGRAM_ENUMERATION("SB2.SideEffectFreeWhitelistStatus",
-                            side_effect_free_whitelist_status,
-                            SIDE_EFFECT_FREE_WHITELIST_STATUS_MAX);
 #endif
 }
 
 SafeBrowsingDatabaseManager::~SafeBrowsingDatabaseManager() {
   // The DCHECK is disabled due to crbug.com/438754.
   // DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   // We should have already been shut down. If we're still enabled, then the
   // database isn't going to be closed properly, which could lead to corruption.
   DCHECK(!enabled_);
@@ skipping 52 matching lines @@
       client,
       safe_browsing_util::EXTENSIONBLACKLIST,
       std::vector<SBThreatType>(1, SB_THREAT_TYPE_EXTENSION));
   StartSafeBrowsingCheck(
       check,
       base::Bind(&SafeBrowsingDatabaseManager::CheckExtensionIDsOnSBThread,
                  this, prefixes));
   return false;
 }
 
-bool SafeBrowsingDatabaseManager::CheckSideEffectFreeWhitelistUrl(
-    const GURL& url) {
-  if (!enabled_)
-    return false;
-
-  if (!CanCheckUrl(url))
-    return false;
-
-  return database_->ContainsSideEffectFreeWhitelistUrl(url);
-}
-
 bool SafeBrowsingDatabaseManager::MatchMalwareIP(
     const std::string& ip_address) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   if (!enabled_ || !enable_ip_blacklist_ || !MakeDatabaseAvailable()) {
     return false;  // Fail open.
   }
   return database_->ContainsMalwareIP(ip_address);
 }
 
 bool SafeBrowsingDatabaseManager::MatchCsdWhitelistUrl(const GURL& url) {
@@ skipping 377 matching lines @@
 
   if (database_)
     return database_;
   startup_metric_utils::ScopedSlowStartupUMA
       scoped_timer("Startup.SlowStartupSafeBrowsingGetDatabase");
   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_side_effect_free_whitelist_,
-      enable_ip_blacklist_, enable_unwanted_software_blacklist_);
+      enable_extension_blacklist_, enable_ip_blacklist_,
+      enable_unwanted_software_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 333 matching lines @@
 
   base::PostTaskAndReplyWithResult(
       safe_browsing_task_runner_.get(), FROM_HERE, task,
       base::Bind(&SafeBrowsingDatabaseManager::OnAsyncCheckDone,
                  check->weak_ptr_factory_->GetWeakPtr(), check));
   base::MessageLoop::current()->PostDelayedTask(FROM_HERE,
       base::Bind(&SafeBrowsingDatabaseManager::TimeoutCallback,
                  check->weak_ptr_factory_->GetWeakPtr(), check),
       check_timeout_);
 }