| 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 193 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 204 builder.set_proxy_config_service( | 204 builder.set_proxy_config_service( |
| 205 data_reduction_proxy_config_service_.release()); | 205 data_reduction_proxy_config_service_.release()); |
| 206 } else { | 206 } else { |
| 207 builder.set_proxy_config_service( | 207 builder.set_proxy_config_service( |
| 208 net::ProxyService::CreateSystemProxyConfigService( | 208 net::ProxyService::CreateSystemProxyConfigService( |
| 209 GetNetworkTaskRunner(), NULL /* Ignored on Android */ )); | 209 GetNetworkTaskRunner(), NULL /* Ignored on Android */ )); |
| 210 } | 210 } |
| 211 builder.set_accept_language(net::HttpUtil::GenerateAcceptLanguageHeader( | 211 builder.set_accept_language(net::HttpUtil::GenerateAcceptLanguageHeader( |
| 212 AwContentBrowserClient::GetAcceptLangsImpl())); | 212 AwContentBrowserClient::GetAcceptLangsImpl())); |
| 213 builder.set_net_log(net_log_.get()); | 213 builder.set_net_log(net_log_.get()); |
| 214 builder.set_channel_id_enabled(false); |
| 214 ApplyCmdlineOverridesToURLRequestContextBuilder(&builder); | 215 ApplyCmdlineOverridesToURLRequestContextBuilder(&builder); |
| 215 | 216 |
| 216 url_request_context_.reset(builder.Build()); | 217 url_request_context_.reset(builder.Build()); |
| 217 // TODO(mnaganov): Fix URLRequestContextBuilder to use proper threads. | 218 // TODO(mnaganov): Fix URLRequestContextBuilder to use proper threads. |
| 218 net::HttpNetworkSession::Params network_session_params; | 219 net::HttpNetworkSession::Params network_session_params; |
| 219 | 220 |
| 220 PopulateNetworkSessionParams(url_request_context_.get(), | 221 PopulateNetworkSessionParams(url_request_context_.get(), |
| 221 &network_session_params); | 222 &network_session_params); |
| 222 | 223 |
| 223 net::HttpCache* main_cache = new net::HttpCache( | 224 net::HttpCache* main_cache = new net::HttpCache( |
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 290 net::NetLog* AwURLRequestContextGetter::GetNetLog() { | 291 net::NetLog* AwURLRequestContextGetter::GetNetLog() { |
| 291 return net_log_.get(); | 292 return net_log_.get(); |
| 292 } | 293 } |
| 293 | 294 |
| 294 void AwURLRequestContextGetter::SetKeyOnIO(const std::string& key) { | 295 void AwURLRequestContextGetter::SetKeyOnIO(const std::string& key) { |
| 295 DCHECK(data_reduction_proxy_auth_request_handler_); | 296 DCHECK(data_reduction_proxy_auth_request_handler_); |
| 296 data_reduction_proxy_auth_request_handler_->InitAuthentication(key); | 297 data_reduction_proxy_auth_request_handler_->InitAuthentication(key); |
| 297 } | 298 } |
| 298 | 299 |
| 299 } // namespace android_webview | 300 } // namespace android_webview |
| OLD | NEW |