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 241 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
252 context->set_cert_verifier(globals->cert_verifier.get()); | 252 context->set_cert_verifier(globals->cert_verifier.get()); |
253 context->set_transport_security_state( | 253 context->set_transport_security_state( |
254 globals->transport_security_state.get()); | 254 globals->transport_security_state.get()); |
255 context->set_cert_transparency_verifier( | 255 context->set_cert_transparency_verifier( |
256 globals->cert_transparency_verifier.get()); | 256 globals->cert_transparency_verifier.get()); |
257 context->set_http_auth_handler_factory( | 257 context->set_http_auth_handler_factory( |
258 globals->http_auth_handler_factory.get()); | 258 globals->http_auth_handler_factory.get()); |
259 context->set_proxy_service(globals->system_proxy_service.get()); | 259 context->set_proxy_service(globals->system_proxy_service.get()); |
260 context->set_http_transaction_factory( | 260 context->set_http_transaction_factory( |
261 globals->system_http_transaction_factory.get()); | 261 globals->system_http_transaction_factory.get()); |
| 262 context->set_job_factory(globals->system_url_request_job_factory.get()); |
262 context->set_cookie_store(globals->system_cookie_store.get()); | 263 context->set_cookie_store(globals->system_cookie_store.get()); |
263 context->set_server_bound_cert_service( | 264 context->set_server_bound_cert_service( |
264 globals->system_server_bound_cert_service.get()); | 265 globals->system_server_bound_cert_service.get()); |
265 context->set_throttler_manager(globals->throttler_manager.get()); | 266 context->set_throttler_manager(globals->throttler_manager.get()); |
266 context->set_network_delegate(globals->system_network_delegate.get()); | 267 context->set_network_delegate(globals->system_network_delegate.get()); |
267 context->set_http_user_agent_settings( | 268 context->set_http_user_agent_settings( |
268 globals->http_user_agent_settings.get()); | 269 globals->http_user_agent_settings.get()); |
269 return context; | 270 return context; |
270 } | 271 } |
271 | 272 |
(...skipping 766 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1038 quick_check_enabled_.GetValue())); | 1039 quick_check_enabled_.GetValue())); |
1039 | 1040 |
1040 net::HttpNetworkSession::Params system_params; | 1041 net::HttpNetworkSession::Params system_params; |
1041 InitializeNetworkSessionParams(&system_params); | 1042 InitializeNetworkSessionParams(&system_params); |
1042 system_params.net_log = net_log_; | 1043 system_params.net_log = net_log_; |
1043 system_params.proxy_service = globals_->system_proxy_service.get(); | 1044 system_params.proxy_service = globals_->system_proxy_service.get(); |
1044 | 1045 |
1045 globals_->system_http_transaction_factory.reset( | 1046 globals_->system_http_transaction_factory.reset( |
1046 new net::HttpNetworkLayer( | 1047 new net::HttpNetworkLayer( |
1047 new net::HttpNetworkSession(system_params))); | 1048 new net::HttpNetworkSession(system_params))); |
| 1049 globals_->system_url_request_job_factory.reset( |
| 1050 new net::URLRequestJobFactoryImpl()); |
1048 globals_->system_request_context.reset( | 1051 globals_->system_request_context.reset( |
1049 ConstructSystemRequestContext(globals_, net_log_)); | 1052 ConstructSystemRequestContext(globals_, net_log_)); |
1050 | 1053 |
1051 sdch_manager_->set_sdch_fetcher( | 1054 sdch_manager_->set_sdch_fetcher( |
1052 new SdchDictionaryFetcher(system_url_request_context_getter_.get())); | 1055 new SdchDictionaryFetcher(system_url_request_context_getter_.get())); |
1053 } | 1056 } |
1054 | 1057 |
1055 void IOThread::UpdateDnsClientEnabled() { | 1058 void IOThread::UpdateDnsClientEnabled() { |
1056 globals()->host_resolver->SetDnsClientEnabled(*dns_client_enabled_); | 1059 globals()->host_resolver->SetDnsClientEnabled(*dns_client_enabled_); |
1057 } | 1060 } |
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1213 std::string version_flag = | 1216 std::string version_flag = |
1214 command_line.GetSwitchValueASCII(switches::kQuicVersion); | 1217 command_line.GetSwitchValueASCII(switches::kQuicVersion); |
1215 for (size_t i = 0; i < supported_versions.size(); ++i) { | 1218 for (size_t i = 0; i < supported_versions.size(); ++i) { |
1216 net::QuicVersion version = supported_versions[i]; | 1219 net::QuicVersion version = supported_versions[i]; |
1217 if (net::QuicVersionToString(version) == version_flag) { | 1220 if (net::QuicVersionToString(version) == version_flag) { |
1218 return version; | 1221 return version; |
1219 } | 1222 } |
1220 } | 1223 } |
1221 return net::QUIC_VERSION_UNSUPPORTED; | 1224 return net::QUIC_VERSION_UNSUPPORTED; |
1222 } | 1225 } |
OLD | NEW |