| 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 706 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 717 params->http_pipelining_enabled = globals->http_pipelining_enabled; | 717 params->http_pipelining_enabled = globals->http_pipelining_enabled; |
| 718 params->testing_fixed_http_port = globals->testing_fixed_http_port; | 718 params->testing_fixed_http_port = globals->testing_fixed_http_port; |
| 719 params->testing_fixed_https_port = globals->testing_fixed_https_port; | 719 params->testing_fixed_https_port = globals->testing_fixed_https_port; |
| 720 | 720 |
| 721 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); | 721 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); |
| 722 if (command_line.HasSwitch(switches::kTrustedSpdyProxy)) { | 722 if (command_line.HasSwitch(switches::kTrustedSpdyProxy)) { |
| 723 params->trusted_spdy_proxy = command_line.GetSwitchValueASCII( | 723 params->trusted_spdy_proxy = command_line.GetSwitchValueASCII( |
| 724 switches::kTrustedSpdyProxy); | 724 switches::kTrustedSpdyProxy); |
| 725 } | 725 } |
| 726 } | 726 } |
| 727 |
| 728 void ProfileIOData::InitForTesting() { |
| 729 initialized_ = true; |
| 730 initialized_on_UI_thread_ = true; |
| 731 |
| 732 // Set up a TransportSecurityState for testing removing browsing data. |
| 733 transport_security_state_.reset(new net::TransportSecurityState()); |
| 734 } |
| 735 |
| OLD | NEW |