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 "android_webview/browser/net/aw_url_request_context_getter.h" | 5 #include "android_webview/browser/net/aw_url_request_context_getter.h" |
6 | 6 |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "android_webview/browser/aw_browser_context.h" | 9 #include "android_webview/browser/aw_browser_context.h" |
10 #include "android_webview/browser/aw_content_browser_client.h" | 10 #include "android_webview/browser/aw_content_browser_client.h" |
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
201 } else { | 201 } else { |
202 builder.set_proxy_config_service( | 202 builder.set_proxy_config_service( |
203 net::ProxyService::CreateSystemProxyConfigService( | 203 net::ProxyService::CreateSystemProxyConfigService( |
204 GetNetworkTaskRunner(), NULL /* Ignored on Android */ )); | 204 GetNetworkTaskRunner(), NULL /* Ignored on Android */ )); |
205 } | 205 } |
206 builder.set_accept_language(net::HttpUtil::GenerateAcceptLanguageHeader( | 206 builder.set_accept_language(net::HttpUtil::GenerateAcceptLanguageHeader( |
207 AwContentBrowserClient::GetAcceptLangsImpl())); | 207 AwContentBrowserClient::GetAcceptLangsImpl())); |
208 ApplyCmdlineOverridesToURLRequestContextBuilder(&builder); | 208 ApplyCmdlineOverridesToURLRequestContextBuilder(&builder); |
209 | 209 |
210 url_request_context_.reset(builder.Build()); | 210 url_request_context_.reset(builder.Build()); |
211 channel_id_service_.reset( | |
212 new net::ChannelIDService( | |
213 new net::DefaultChannelIDStore(NULL), | |
214 base::WorkerPool::GetTaskRunner(true))); | |
215 url_request_context_->set_channel_id_service(channel_id_service_.get()); | |
216 // TODO(mnaganov): Fix URLRequestContextBuilder to use proper threads. | 211 // TODO(mnaganov): Fix URLRequestContextBuilder to use proper threads. |
217 net::HttpNetworkSession::Params network_session_params; | 212 net::HttpNetworkSession::Params network_session_params; |
218 | 213 |
219 PopulateNetworkSessionParams(url_request_context_.get(), | 214 PopulateNetworkSessionParams(url_request_context_.get(), |
220 &network_session_params); | 215 &network_session_params); |
221 | 216 |
222 net::HttpCache* main_cache = new net::HttpCache( | 217 net::HttpCache* main_cache = new net::HttpCache( |
223 network_session_params, | 218 network_session_params, |
224 new net::HttpCache::DefaultBackend( | 219 new net::HttpCache::DefaultBackend( |
225 net::DISK_CACHE, | 220 net::DISK_CACHE, |
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
275 std::swap(protocol_handlers_, *protocol_handlers); | 270 std::swap(protocol_handlers_, *protocol_handlers); |
276 request_interceptors_.swap(request_interceptors); | 271 request_interceptors_.swap(request_interceptors); |
277 } | 272 } |
278 | 273 |
279 data_reduction_proxy::DataReductionProxyAuthRequestHandler* | 274 data_reduction_proxy::DataReductionProxyAuthRequestHandler* |
280 AwURLRequestContextGetter::GetDataReductionProxyAuthRequestHandler() const { | 275 AwURLRequestContextGetter::GetDataReductionProxyAuthRequestHandler() const { |
281 return data_reduction_proxy_auth_request_handler_.get(); | 276 return data_reduction_proxy_auth_request_handler_.get(); |
282 } | 277 } |
283 | 278 |
284 } // namespace android_webview | 279 } // namespace android_webview |
OLD | NEW |