Refactor TransportSecurityState.

chrome/browser/profiles/profile_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_io_data.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ skipping 447 matching lines @@
       new chrome_browser_net::ChromeFraudulentCertificateReporter(
           main_request_context_));
 
   proxy_service_.reset(
       ProxyServiceFactory::CreateProxyService(
           io_thread->net_log(),
           io_thread_globals->proxy_script_fetcher_context.get(),
           profile_params_->proxy_config_service.release(),
           command_line));
 
-  transport_security_state_.reset(new net::TransportSecurityState(
-      command_line.GetSwitchValueASCII(switches::kHstsHosts)));
+  transport_security_state_.reset(new net::TransportSecurityState());
   transport_security_persister_.reset(
       new TransportSecurityPersister(transport_security_state_.get(),
                                      profile_params_->path,
                                      profile_params_->is_incognito));
+  const std::string& serialized =
+      command_line.GetSwitchValueASCII(switches::kHstsHosts);
+  transport_security_persister_.get()->DeserializeFromCommandLine(serialized);
 
   // NOTE(willchan): Keep these protocol handlers in sync with
   // ProfileIOData::IsHandledProtocol().
   job_factory_.reset(new net::URLRequestJobFactory);
   if (profile_params_->protocol_handler_registry) {
     job_factory_->AddInterceptor(
         new ProtocolHandlerRegistryInterceptor(
             profile_params_->protocol_handler_registry));
   }
   bool set_protocol = job_factory_->SetProtocolHandler(
@@ skipping 56 matching lines @@
 #endif
   bool posted = BrowserThread::DeleteSoon(BrowserThread::IO, FROM_HERE, this);
   if (!posted)
     delete this;
 }
 
 void ProfileIOData::set_server_bound_cert_service(
     net::ServerBoundCertService* server_bound_cert_service) const {
   server_bound_cert_service_.reset(server_bound_cert_service);
 }