Chromium Code Reviews| 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/io_thread.h" | 5 #include "chrome/browser/io_thread.h" |
| 6 | 6 |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "base/base64.h" | 9 #include "base/base64.h" |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 1016 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1027 net_log_, | 1027 net_log_, |
| 1028 globals_->proxy_script_fetcher_context.get(), | 1028 globals_->proxy_script_fetcher_context.get(), |
| 1029 globals_->system_network_delegate.get(), | 1029 globals_->system_network_delegate.get(), |
| 1030 system_proxy_config_service_.release(), | 1030 system_proxy_config_service_.release(), |
| 1031 command_line, | 1031 command_line, |
| 1032 quick_check_enabled_.GetValue())); | 1032 quick_check_enabled_.GetValue())); |
| 1033 | 1033 |
| 1034 net::HttpNetworkSession::Params system_params; | 1034 net::HttpNetworkSession::Params system_params; |
| 1035 InitializeNetworkSessionParams(&system_params); | 1035 InitializeNetworkSessionParams(&system_params); |
| 1036 system_params.net_log = net_log_; | 1036 system_params.net_log = net_log_; |
| 1037 system_params.ssl_host_info_factory = NULL; | |
|
wtc
2014/01/15 19:08:59
This change is not necessary because the HttpNetwo
ramant (doing other things)
2014/01/18 00:21:56
Done.
| |
| 1037 system_params.proxy_service = globals_->system_proxy_service.get(); | 1038 system_params.proxy_service = globals_->system_proxy_service.get(); |
| 1038 | 1039 |
| 1039 globals_->system_http_transaction_factory.reset( | 1040 globals_->system_http_transaction_factory.reset( |
| 1040 new net::HttpNetworkLayer( | 1041 new net::HttpNetworkLayer( |
| 1041 new net::HttpNetworkSession(system_params))); | 1042 new net::HttpNetworkSession(system_params))); |
| 1042 globals_->system_request_context.reset( | 1043 globals_->system_request_context.reset( |
| 1043 ConstructSystemRequestContext(globals_, net_log_)); | 1044 ConstructSystemRequestContext(globals_, net_log_)); |
| 1044 | 1045 |
| 1045 sdch_manager_->set_sdch_fetcher( | 1046 sdch_manager_->set_sdch_fetcher( |
| 1046 new SdchDictionaryFetcher(system_url_request_context_getter_.get())); | 1047 new SdchDictionaryFetcher(system_url_request_context_getter_.get())); |
| (...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1151 std::string version_flag = | 1152 std::string version_flag = |
| 1152 command_line.GetSwitchValueASCII(switches::kQuicVersion); | 1153 command_line.GetSwitchValueASCII(switches::kQuicVersion); |
| 1153 for (size_t i = 0; i < supported_versions.size(); ++i) { | 1154 for (size_t i = 0; i < supported_versions.size(); ++i) { |
| 1154 net::QuicVersion version = supported_versions[i]; | 1155 net::QuicVersion version = supported_versions[i]; |
| 1155 if (net::QuicVersionToString(version) == version_flag) { | 1156 if (net::QuicVersionToString(version) == version_flag) { |
| 1156 return version; | 1157 return version; |
| 1157 } | 1158 } |
| 1158 } | 1159 } |
| 1159 return net::QUIC_VERSION_UNSUPPORTED; | 1160 return net::QUIC_VERSION_UNSUPPORTED; |
| 1160 } | 1161 } |
| OLD | NEW |