Replace ProfileIOData::http_server_properties_manager_ with http_server_properties_.

chrome/browser/profiles/profile_impl_io_data.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/profiles/profile_impl_io_data.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/logging.h"
@@ skipping 42 matching lines @@
 
 ProfileImplIOData::Handle::~Handle() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (io_data_->predictor_.get() != NULL) {
     // io_data_->predictor_ might be NULL if Init() was never called
     // (i.e. we shut down before ProfileImpl::DoFinalInit() got called).
     PrefService* user_prefs = profile_->GetPrefs();
     io_data_->predictor_->ShutdownOnUIThread(user_prefs);
   }
 
-  if (io_data_->http_server_properties_manager())
-    io_data_->http_server_properties_manager()->ShutdownOnUIThread();
+  if (io_data_->http_server_properties_manager_)
+    io_data_->http_server_properties_manager_->ShutdownOnUIThread();
   io_data_->ShutdownOnUIThread();
 }
 
 void ProfileImplIOData::Handle::Init(
       const FilePath& cookie_path,
       const FilePath& server_bound_cert_path,
       const FilePath& cache_path,
       int cache_max_size,
       const FilePath& media_cache_path,
       int media_cache_max_size,
@@ skipping 185 matching lines @@
 }
 
 void ProfileImplIOData::Handle::LazyInitialize() const {
   if (initialized_)
     return;
 
   // Set initialized_ to true at the beginning in case any of the objects
   // below try to get the ResourceContext pointer.
   initialized_ = true;
   PrefService* pref_service = profile_->GetPrefs();
-  io_data_->set_http_server_properties_manager(
-      new chrome_browser_net::HttpServerPropertiesManager(pref_service));
+  io_data_->http_server_properties_manager_ =
+      new chrome_browser_net::HttpServerPropertiesManager(pref_service);
+  io_data_->set_http_server_properties(
+      io_data_->http_server_properties_manager_);
   io_data_->session_startup_pref()->Init(
       prefs::kRestoreOnStartup, pref_service, NULL);
   io_data_->session_startup_pref()->MoveToThread(
       BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO));
 #if defined(FULL_SAFE_BROWSING) || defined(MOBILE_SAFE_BROWSING)
   io_data_->safe_browsing_enabled()->Init(prefs::kSafeBrowsingEnabled,
       pref_service, NULL);
   io_data_->safe_browsing_enabled()->MoveToThread(
       BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO));
 #endif
@@ skipping 27 matching lines @@
   // a cycle, and the user has limited control.
   bool record_mode = command_line.HasSwitch(switches::kRecordMode) &&
                      (chrome::kRecordModeEnabled ||
                       command_line.HasSwitch(switches::kVisitURLs));
   bool playback_mode = command_line.HasSwitch(switches::kPlaybackMode);
 
   // Initialize context members.
 
   ApplyProfileParamsToContext(main_context);
 
-  if (http_server_properties_manager())
-    http_server_properties_manager()->InitializeOnIOThread();
+  if (http_server_properties_manager_)
+    http_server_properties_manager_->InitializeOnIOThread();
 
   main_context->set_transport_security_state(transport_security_state());
 
   main_context->set_net_log(io_thread->net_log());
 
   main_context->set_network_delegate(network_delegate());
 
-  main_context->set_http_server_properties(http_server_properties_manager());
+  main_context->set_http_server_properties(http_server_properties());
 
   main_context->set_host_resolver(
       io_thread_globals->host_resolver.get());
   main_context->set_cert_verifier(
       io_thread_globals->cert_verifier.get());
   main_context->set_http_auth_handler_factory(
       io_thread_globals->http_auth_handler_factory.get());
 
   main_context->set_fraudulent_certificate_reporter(
       fraudulent_certificate_reporter());
@@ skipping 334 matching lines @@
 }
 
 void ProfileImplIOData::ClearNetworkingHistorySinceOnIOThread(
     base::Time time,
     const base::Closure& completion) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   LazyInitialize();
 
   DCHECK(transport_security_state());
   transport_security_state()->DeleteSince(time);  // Completes synchronously.
-  DCHECK(http_server_properties_manager());
-  http_server_properties_manager()->Clear(completion);
+  DCHECK(http_server_properties_manager_);
+  http_server_properties_manager_->Clear(completion);
 }