diff options
| author | Andreas Huber <andih@google.com> | 2011-03-09 13:36:15 -0800 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2011-03-09 13:36:15 -0800 |
| commit | 72fee698602ede6f6b64b77c0f1f28d96ff673d3 (patch) | |
| tree | 2eff99f09da079ed1a438c218c760ebeb5e82e75 /media/libstagefright/chromium_http | |
| parent | 2aac40fe9d42a15dab0af6a0efea7a2468cd9e4f (diff) | |
| download | frameworks_av-72fee698602ede6f6b64b77c0f1f28d96ff673d3.zip frameworks_av-72fee698602ede6f6b64b77c0f1f28d96ff673d3.tar.gz frameworks_av-72fee698602ede6f6b64b77c0f1f28d96ff673d3.tar.bz2 | |
Use the same http proxy mechanism that webkit uses instead of bypassing proxies.
Change-Id: Ifd64664d3052fbfa715c2920984170c2a6190f6b
related-to-bug: 3440271
Diffstat (limited to 'media/libstagefright/chromium_http')
| -rw-r--r-- | media/libstagefright/chromium_http/support.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/media/libstagefright/chromium_http/support.cpp b/media/libstagefright/chromium_http/support.cpp index d1380f0..8b9da6e 100644 --- a/media/libstagefright/chromium_http/support.cpp +++ b/media/libstagefright/chromium_http/support.cpp @@ -27,6 +27,7 @@ #include "net/base/host_resolver.h" #include "net/base/ssl_config_service.h" #include "net/http/http_cache.h" +#include "net/proxy/proxy_config_service_android.h" #include "include/ChromiumHTTPDataSource.h" @@ -120,7 +121,8 @@ SfRequestContext::SfRequestContext() { ssl_config_service_ = net::SSLConfigService::CreateSystemSSLConfigService(); - proxy_service_ = net::ProxyService::CreateDirect(); + proxy_service_ = net::ProxyService::CreateWithoutProxyResolver( + new net::ProxyConfigServiceAndroid, net_log_); http_transaction_factory_ = new net::HttpCache( host_resolver_, |