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 1018 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1029 system_params.net_log = net_log_; | 1029 system_params.net_log = net_log_; |
1030 system_params.proxy_service = globals_->system_proxy_service.get(); | 1030 system_params.proxy_service = globals_->system_proxy_service.get(); |
1031 | 1031 |
1032 globals_->system_http_transaction_factory.reset( | 1032 globals_->system_http_transaction_factory.reset( |
1033 new net::HttpNetworkLayer( | 1033 new net::HttpNetworkLayer( |
1034 new net::HttpNetworkSession(system_params))); | 1034 new net::HttpNetworkSession(system_params))); |
1035 globals_->system_request_context.reset( | 1035 globals_->system_request_context.reset( |
1036 ConstructSystemRequestContext(globals_, net_log_)); | 1036 ConstructSystemRequestContext(globals_, net_log_)); |
1037 | 1037 |
1038 sdch_manager_->set_sdch_fetcher( | 1038 sdch_manager_->set_sdch_fetcher( |
1039 new SdchDictionaryFetcher(system_url_request_context_getter_.get())); | 1039 new SdchDictionaryFetcher( |
| 1040 sdch_manager_, system_url_request_context_getter_.get())); |
1040 } | 1041 } |
1041 | 1042 |
1042 void IOThread::UpdateDnsClientEnabled() { | 1043 void IOThread::UpdateDnsClientEnabled() { |
1043 globals()->host_resolver->SetDnsClientEnabled(*dns_client_enabled_); | 1044 globals()->host_resolver->SetDnsClientEnabled(*dns_client_enabled_); |
1044 } | 1045 } |
1045 | 1046 |
1046 void IOThread::ConfigureQuic(const CommandLine& command_line) { | 1047 void IOThread::ConfigureQuic(const CommandLine& command_line) { |
1047 // Always fetch the field trial group to ensure it is reported correctly. | 1048 // Always fetch the field trial group to ensure it is reported correctly. |
1048 // The command line flags will be associated with a group that is reported | 1049 // The command line flags will be associated with a group that is reported |
1049 // so long as trial is actually queried. | 1050 // so long as trial is actually queried. |
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1217 std::string version_flag = | 1218 std::string version_flag = |
1218 command_line.GetSwitchValueASCII(switches::kQuicVersion); | 1219 command_line.GetSwitchValueASCII(switches::kQuicVersion); |
1219 for (size_t i = 0; i < supported_versions.size(); ++i) { | 1220 for (size_t i = 0; i < supported_versions.size(); ++i) { |
1220 net::QuicVersion version = supported_versions[i]; | 1221 net::QuicVersion version = supported_versions[i]; |
1221 if (net::QuicVersionToString(version) == version_flag) { | 1222 if (net::QuicVersionToString(version) == version_flag) { |
1222 return version; | 1223 return version; |
1223 } | 1224 } |
1224 } | 1225 } |
1225 return net::QUIC_VERSION_UNSUPPORTED; | 1226 return net::QUIC_VERSION_UNSUPPORTED; |
1226 } | 1227 } |
OLD | NEW |