Introduce net::HttpServerPropertiesManager to manage server-specific properties.

chrome/browser/profiles/profile_impl_io_data.cc

 // Copyright (c) 2011 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/profiles/profile_impl_io_data.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "chrome/browser/io_thread.h"
 #include "chrome/browser/net/chrome_net_log.h"
 #include "chrome/browser/net/chrome_network_delegate.h"
 #include "chrome/browser/net/connect_interceptor.h"
+#include "chrome/browser/net/http_server_properties_manager.h"
 #include "chrome/browser/net/predictor.h"
 #include "chrome/browser/net/sqlite_origin_bound_cert_store.h"
 #include "chrome/browser/net/sqlite_persistent_cookie_store.h"
 #include "chrome/browser/prefs/pref_member.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/resource_context.h"
 #include "net/base/origin_bound_cert_service.h"
 #include "net/ftp/ftp_network_layer.h"
 #include "net/http/http_cache.h"
 #include "net/url_request/url_request_job_factory.h"
 
 namespace {
 
-void DeleteTransportSecurityStateSinceOnIOThread(
+void ClearNetworkingHistorySinceOnIOThread(
     ProfileImplIOData* io_data, base::Time time) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   io_data->transport_security_state()->DeleteSince(time);
+  io_data->http_server_properties()->DeleteAll();
 }
 
 }  // namespace
 
 ProfileImplIOData::Handle::Handle(Profile* profile)
     : io_data_(new ProfileImplIOData),
       profile_(profile),
       initialized_(false) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(profile);
@@ skipping 16 matching lines @@
   }
 
   // Clean up all isolated app request contexts.
   for (ChromeURLRequestContextGetterMap::iterator iter =
            app_request_context_getter_map_.begin();
        iter != app_request_context_getter_map_.end();
        ++iter) {
     iter->second->CleanupOnUIThread();
   }
 
+  if (io_data_->http_server_properties_manager_.get())
+    io_data_->http_server_properties_manager_->ShutdownOnUIThread();
   io_data_->ShutdownOnUIThread();
 }
 
 void ProfileImplIOData::Handle::Init(
       const FilePath& cookie_path,
       const FilePath& origin_bound_cert_path,
       const FilePath& cache_path,
       int cache_max_size,
       const FilePath& media_cache_path,
       int media_cache_max_size,
@@ skipping 95 matching lines @@
 
 
   ChromeURLRequestContextGetter* context =
       ChromeURLRequestContextGetter::CreateOriginalForIsolatedApp(
           profile_, io_data_, app_id);
   app_request_context_getter_map_[app_id] = context;
 
   return context;
 }
 
-void ProfileImplIOData::Handle::DeleteTransportSecurityStateSince(
+void ProfileImplIOData::Handle::ClearNetworkingHistorySince(
     base::Time time) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   LazyInitialize();
 
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(
-          &DeleteTransportSecurityStateSinceOnIOThread,
+          &ClearNetworkingHistorySinceOnIOThread,
           io_data_,
           time));
 }
 
 void ProfileImplIOData::Handle::LazyInitialize() const {
   if (!initialized_) {
     io_data_->InitializeOnUIThread(profile_);
+    PrefService* pref_service = profile_->GetPrefs();
+    io_data_->http_server_properties_manager_.reset(
+        new chrome_browser_net::HttpServerPropertiesManager(pref_service));
     ChromeNetworkDelegate::InitializeReferrersEnabled(
-        io_data_->enable_referrers(), profile_->GetPrefs());
+        io_data_->enable_referrers(), pref_service);
     io_data_->clear_local_state_on_exit()->Init(
-        prefs::kClearSiteDataOnExit, profile_->GetPrefs(), NULL);
+        prefs::kClearSiteDataOnExit, pref_service, NULL);
     io_data_->clear_local_state_on_exit()->MoveToThread(BrowserThread::IO);
 #if defined(ENABLE_SAFE_BROWSING)
     io_data_->safe_browsing_enabled()->Init(prefs::kSafeBrowsingEnabled,
-        profile_->GetPrefs(), NULL);
+        pref_service, NULL);
     io_data_->safe_browsing_enabled()->MoveToThread(BrowserThread::IO);
 #endif
     initialized_ = true;
   }
 }
 
 ProfileImplIOData::LazyParams::LazyParams()
     : cache_max_size(0),
       media_cache_max_size(0) {}
 ProfileImplIOData::LazyParams::~LazyParams() {}
@@ skipping 18 matching lines @@
   bool record_mode = chrome::kRecordModeEnabled &&
                      command_line.HasSwitch(switches::kRecordMode);
   bool playback_mode = command_line.HasSwitch(switches::kPlaybackMode);
 
   // Initialize context members.
 
   ApplyProfileParamsToContext(main_context);
   ApplyProfileParamsToContext(media_request_context_);
   ApplyProfileParamsToContext(extensions_context);
 
+  if (http_server_properties_manager_.get())
+    http_server_properties_manager_->InitializeOnIOThread();
+
   main_context->set_transport_security_state(transport_security_state());
   media_request_context_->set_transport_security_state(
       transport_security_state());
   extensions_context->set_transport_security_state(transport_security_state());
 
   main_context->set_net_log(io_thread->net_log());
   media_request_context_->set_net_log(io_thread->net_log());
   extensions_context->set_net_log(io_thread->net_log());
 
   main_context->set_network_delegate(network_delegate());
   media_request_context_->set_network_delegate(network_delegate());
 
+  main_context->set_http_server_properties(http_server_properties());
+  media_request_context_->set_http_server_properties(http_server_properties());
+
   main_context->set_host_resolver(
       io_thread_globals->host_resolver.get());
   media_request_context_->set_host_resolver(
       io_thread_globals->host_resolver.get());
   main_context->set_cert_verifier(
       io_thread_globals->cert_verifier.get());
   media_request_context_->set_cert_verifier(
       io_thread_globals->cert_verifier.get());
   main_context->set_dnsrr_resolver(
       io_thread_globals->dnsrr_resolver.get());
@@ skipping 73 matching lines @@
   net::HttpCache* main_cache = new net::HttpCache(
       main_context->host_resolver(),
       main_context->cert_verifier(),
       main_context->origin_bound_cert_service(),
       main_context->dnsrr_resolver(),
       main_context->dns_cert_checker(),
       main_context->proxy_service(),
       main_context->ssl_config_service(),
       main_context->http_auth_handler_factory(),
       main_context->network_delegate(),
+      main_context->http_server_properties(),
       main_context->net_log(),
       main_backend);
 
   net::HttpCache::DefaultBackend* media_backend =
       new net::HttpCache::DefaultBackend(
           net::MEDIA_CACHE, lazy_params_->media_cache_path,
           lazy_params_->media_cache_max_size,
           BrowserThread::GetMessageLoopProxyForThread(BrowserThread::CACHE));
   net::HttpNetworkSession* main_network_session = main_cache->GetSession();
   net::HttpCache* media_cache =
@@ skipping 18 matching lines @@
   main_context->set_job_factory(job_factory());
   media_request_context_->set_job_factory(job_factory());
   extensions_context->set_job_factory(job_factory());
 
   job_factory()->AddInterceptor(
       new chrome_browser_net::ConnectInterceptor(predictor_.get()));
 
   lazy_params_.reset();
 }
 
+net::HttpServerProperties* ProfileImplIOData::http_server_properties() const {
+  return http_server_properties_manager_.get();
+}
+
 scoped_refptr<ChromeURLRequestContext>
 ProfileImplIOData::InitializeAppRequestContext(
     scoped_refptr<ChromeURLRequestContext> main_context,
     const std::string& app_id) const {
   AppRequestContext* context = new AppRequestContext;
 
   // Copy most state from the main context.
   context->CopyFrom(main_context);
 
   FilePath app_path = app_path_.AppendASCII(app_id);
@@ skipping 58 matching lines @@
 scoped_refptr<ChromeURLRequestContext>
 ProfileImplIOData::AcquireIsolatedAppRequestContext(
     scoped_refptr<ChromeURLRequestContext> main_context,
     const std::string& app_id) const {
   // We create per-app contexts on demand, unlike the others above.
   scoped_refptr<ChromeURLRequestContext> app_request_context =
       InitializeAppRequestContext(main_context, app_id);
   DCHECK(app_request_context);
   return app_request_context;
 }