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 1031 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1042 system_params.net_log = net_log_; | 1042 system_params.net_log = net_log_; |
1043 system_params.proxy_service = globals_->system_proxy_service.get(); | 1043 system_params.proxy_service = globals_->system_proxy_service.get(); |
1044 | 1044 |
1045 globals_->system_http_transaction_factory.reset( | 1045 globals_->system_http_transaction_factory.reset( |
1046 new net::HttpNetworkLayer( | 1046 new net::HttpNetworkLayer( |
1047 new net::HttpNetworkSession(system_params))); | 1047 new net::HttpNetworkSession(system_params))); |
1048 globals_->system_request_context.reset( | 1048 globals_->system_request_context.reset( |
1049 ConstructSystemRequestContext(globals_, net_log_)); | 1049 ConstructSystemRequestContext(globals_, net_log_)); |
1050 | 1050 |
1051 sdch_manager_->set_sdch_fetcher( | 1051 sdch_manager_->set_sdch_fetcher( |
1052 new SdchDictionaryFetcher(system_url_request_context_getter_.get())); | 1052 new SdchDictionaryFetcher( |
| 1053 sdch_manager_, system_url_request_context_getter_.get())); |
1053 } | 1054 } |
1054 | 1055 |
1055 void IOThread::UpdateDnsClientEnabled() { | 1056 void IOThread::UpdateDnsClientEnabled() { |
1056 globals()->host_resolver->SetDnsClientEnabled(*dns_client_enabled_); | 1057 globals()->host_resolver->SetDnsClientEnabled(*dns_client_enabled_); |
1057 } | 1058 } |
1058 | 1059 |
1059 void IOThread::ConfigureQuic(const CommandLine& command_line) { | 1060 void IOThread::ConfigureQuic(const CommandLine& command_line) { |
1060 // Always fetch the field trial group to ensure it is reported correctly. | 1061 // Always fetch the field trial group to ensure it is reported correctly. |
1061 // The command line flags will be associated with a group that is reported | 1062 // The command line flags will be associated with a group that is reported |
1062 // so long as trial is actually queried. | 1063 // so long as trial is actually queried. |
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1213 std::string version_flag = | 1214 std::string version_flag = |
1214 command_line.GetSwitchValueASCII(switches::kQuicVersion); | 1215 command_line.GetSwitchValueASCII(switches::kQuicVersion); |
1215 for (size_t i = 0; i < supported_versions.size(); ++i) { | 1216 for (size_t i = 0; i < supported_versions.size(); ++i) { |
1216 net::QuicVersion version = supported_versions[i]; | 1217 net::QuicVersion version = supported_versions[i]; |
1217 if (net::QuicVersionToString(version) == version_flag) { | 1218 if (net::QuicVersionToString(version) == version_flag) { |
1218 return version; | 1219 return version; |
1219 } | 1220 } |
1220 } | 1221 } |
1221 return net::QUIC_VERSION_UNSUPPORTED; | 1222 return net::QUIC_VERSION_UNSUPPORTED; |
1222 } | 1223 } |
OLD | NEW |