Revert of Clear SDCH information on "Clear browsing data" path.

net/base/sdch_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 "net/base/sdch_manager.h"
 
 #include "base/base64.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 206 matching lines @@
 
 SdchManager::~SdchManager() {
   DCHECK(CalledOnValidThread());
   while (!dictionaries_.empty()) {
     DictionaryMap::iterator it = dictionaries_.begin();
     it->second->Release();
     dictionaries_.erase(it->first);
   }
 }
 
-void SdchManager::ClearData() {
-  blacklisted_domains_.clear();
-  exponential_blacklist_count_.clear();
-  allow_latency_experiment_.clear();
-  if (fetcher_.get())
-    fetcher_->Cancel();
-
-  // Note that this may result in not having dictionaries we've advertised
-  // for incoming responses.  The window is relatively small (as ClearData()
-  // is not expected to be called frequently), so we rely on meta-refresh
-  // to handle this case.
-  dictionaries_.clear();
-}
-
 // static
 void SdchManager::SdchErrorRecovery(ProblemCodes problem) {
   UMA_HISTOGRAM_ENUMERATION("Sdch3.ProblemCodes_4", problem, MAX_PROBLEM_CODE);
 }
 
 void SdchManager::set_sdch_fetcher(SdchFetcher* fetcher) {
   DCHECK(CalledOnValidThread());
   fetcher_.reset(fetcher);
 }
 
 // static
 void SdchManager::EnableSdchSupport(bool enabled) {
   g_sdch_enabled_ = enabled;
 }
 
 // static
 void SdchManager::EnableSecureSchemeSupport(bool enabled) {
   g_secure_scheme_supported_ = enabled;
 }
 
 void SdchManager::BlacklistDomain(const GURL& url) {
   SetAllowLatencyExperiment(url, false);
 
   std::string domain(StringToLowerASCII(url.host()));
   int count = blacklisted_domains_[domain];
   if (count > 0)
     return;  // Domain is already blacklisted.
 
-  count = 1 + 2 * exponential_blacklist_count_[domain];
+  count = 1 + 2 * exponential_blacklist_count[domain];
   if (count > 0)
-    exponential_blacklist_count_[domain] = count;
+    exponential_blacklist_count[domain] = count;
   else
     count = INT_MAX;
 
   blacklisted_domains_[domain] = count;
 }
 
 void SdchManager::BlacklistDomainForever(const GURL& url) {
   SetAllowLatencyExperiment(url, false);
 
   std::string domain(StringToLowerASCII(url.host()));
-  exponential_blacklist_count_[domain] = INT_MAX;
+  exponential_blacklist_count[domain] = INT_MAX;
   blacklisted_domains_[domain] = INT_MAX;
 }
 
 void SdchManager::ClearBlacklistings() {
   blacklisted_domains_.clear();
-  exponential_blacklist_count_.clear();
+  exponential_blacklist_count.clear();
 }
 
 void SdchManager::ClearDomainBlacklisting(const std::string& domain) {
   blacklisted_domains_.erase(StringToLowerASCII(domain));
 }
 
 int SdchManager::BlackListDomainCount(const std::string& domain) {
   if (blacklisted_domains_.end() == blacklisted_domains_.find(domain))
     return 0;
   return blacklisted_domains_[StringToLowerASCII(domain)];
 }
 
 int SdchManager::BlacklistDomainExponential(const std::string& domain) {
-  if (exponential_blacklist_count_.end() ==
-      exponential_blacklist_count_.find(domain))
+  if (exponential_blacklist_count.end() ==
+      exponential_blacklist_count.find(domain))
     return 0;
-  return exponential_blacklist_count_[StringToLowerASCII(domain)];
+  return exponential_blacklist_count[StringToLowerASCII(domain)];
 }
 
 bool SdchManager::IsInSupportedDomain(const GURL& url) {
   DCHECK(CalledOnValidThread());
   if (!g_sdch_enabled_ )
     return false;
 
   if (!secure_scheme_supported() && url.SchemeIsSecure())
     return false;
 
@@ skipping 248 matching lines @@
       case '/':
         (*output)[i] = '_';
         continue;
       default:
         continue;
     }
   }
 }
 
 }  // namespace net