| 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 546 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 557 | 557 |
| 558 fraudulent_certificate_reporter_.reset( | 558 fraudulent_certificate_reporter_.reset( |
| 559 new chrome_browser_net::ChromeFraudulentCertificateReporter( | 559 new chrome_browser_net::ChromeFraudulentCertificateReporter( |
| 560 main_request_context_.get())); | 560 main_request_context_.get())); |
| 561 | 561 |
| 562 proxy_service_.reset( | 562 proxy_service_.reset( |
| 563 ProxyServiceFactory::CreateProxyService( | 563 ProxyServiceFactory::CreateProxyService( |
| 564 io_thread->net_log(), | 564 io_thread->net_log(), |
| 565 io_thread_globals->proxy_script_fetcher_context.get(), | 565 io_thread_globals->proxy_script_fetcher_context.get(), |
| 566 profile_params_->proxy_config_service.release(), | 566 profile_params_->proxy_config_service.release(), |
| 567 io_thread_globals->v8_default_isolate, |
| 567 command_line)); | 568 command_line)); |
| 568 | 569 |
| 569 transport_security_state_.reset(new net::TransportSecurityState()); | 570 transport_security_state_.reset(new net::TransportSecurityState()); |
| 570 transport_security_persister_.reset( | 571 transport_security_persister_.reset( |
| 571 new TransportSecurityPersister(transport_security_state_.get(), | 572 new TransportSecurityPersister(transport_security_state_.get(), |
| 572 profile_params_->path, | 573 profile_params_->path, |
| 573 is_incognito())); | 574 is_incognito())); |
| 574 const std::string& serialized = | 575 const std::string& serialized = |
| 575 command_line.GetSwitchValueASCII(switches::kHstsHosts); | 576 command_line.GetSwitchValueASCII(switches::kHstsHosts); |
| 576 transport_security_persister_.get()->DeserializeFromCommandLine(serialized); | 577 transport_security_persister_.get()->DeserializeFromCommandLine(serialized); |
| (...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 733 void ProfileIOData::SetCookieSettingsForTesting( | 734 void ProfileIOData::SetCookieSettingsForTesting( |
| 734 CookieSettings* cookie_settings) { | 735 CookieSettings* cookie_settings) { |
| 735 DCHECK(!cookie_settings_.get()); | 736 DCHECK(!cookie_settings_.get()); |
| 736 cookie_settings_ = cookie_settings; | 737 cookie_settings_ = cookie_settings; |
| 737 } | 738 } |
| 738 | 739 |
| 739 void ProfileIOData::set_signin_names_for_testing( | 740 void ProfileIOData::set_signin_names_for_testing( |
| 740 SigninNamesOnIOThread* signin_names) { | 741 SigninNamesOnIOThread* signin_names) { |
| 741 signin_names_.reset(signin_names); | 742 signin_names_.reset(signin_names); |
| 742 } | 743 } |
| OLD | NEW |