| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/profiles/profile_io_data.h" | 5 #include "chrome/browser/profiles/profile_io_data.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 418 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 429 new chrome_browser_net::ChromeFraudulentCertificateReporter( | 429 new chrome_browser_net::ChromeFraudulentCertificateReporter( |
| 430 main_request_context_)); | 430 main_request_context_)); |
| 431 | 431 |
| 432 proxy_service_.reset( | 432 proxy_service_.reset( |
| 433 ProxyServiceFactory::CreateProxyService( | 433 ProxyServiceFactory::CreateProxyService( |
| 434 io_thread->net_log(), | 434 io_thread->net_log(), |
| 435 io_thread_globals->proxy_script_fetcher_context.get(), | 435 io_thread_globals->proxy_script_fetcher_context.get(), |
| 436 profile_params_->proxy_config_service.release(), | 436 profile_params_->proxy_config_service.release(), |
| 437 command_line)); | 437 command_line)); |
| 438 | 438 |
| 439 transport_security_state_.reset(new net::TransportSecurityState( | 439 transport_security_state_.reset(new net::TransportSecurityState()); |
| 440 command_line.GetSwitchValueASCII(switches::kHstsHosts))); | |
| 441 transport_security_persister_.reset( | 440 transport_security_persister_.reset( |
| 442 new TransportSecurityPersister(transport_security_state_.get(), | 441 new TransportSecurityPersister(transport_security_state_.get(), |
| 443 profile_params_->path, | 442 profile_params_->path, |
| 444 profile_params_->is_incognito)); | 443 profile_params_->is_incognito)); |
| 445 | 444 |
| 446 // NOTE(willchan): Keep these protocol handlers in sync with | 445 // NOTE(willchan): Keep these protocol handlers in sync with |
| 447 // ProfileIOData::IsHandledProtocol(). | 446 // ProfileIOData::IsHandledProtocol(). |
| 448 job_factory_.reset(new net::URLRequestJobFactory); | 447 job_factory_.reset(new net::URLRequestJobFactory); |
| 449 if (profile_params_->protocol_handler_registry) { | 448 if (profile_params_->protocol_handler_registry) { |
| 450 job_factory_->AddInterceptor( | 449 job_factory_->AddInterceptor( |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 519 &resource_context_)); | 518 &resource_context_)); |
| 520 bool posted = BrowserThread::DeleteSoon(BrowserThread::IO, FROM_HERE, this); | 519 bool posted = BrowserThread::DeleteSoon(BrowserThread::IO, FROM_HERE, this); |
| 521 if (!posted) | 520 if (!posted) |
| 522 delete this; | 521 delete this; |
| 523 } | 522 } |
| 524 | 523 |
| 525 void ProfileIOData::set_server_bound_cert_service( | 524 void ProfileIOData::set_server_bound_cert_service( |
| 526 net::ServerBoundCertService* server_bound_cert_service) const { | 525 net::ServerBoundCertService* server_bound_cert_service) const { |
| 527 server_bound_cert_service_.reset(server_bound_cert_service); | 526 server_bound_cert_service_.reset(server_bound_cert_service); |
| 528 } | 527 } |
| OLD | NEW |