diff options
author | Kristian Monsen <kristianm@google.com> | 2011-06-27 10:49:11 +0100 |
---|---|---|
committer | Kristian Monsen <kristianm@google.com> | 2011-06-29 16:00:27 +0100 |
commit | 63d794763a680c29edccce3a6fac3d6d9c13c8e3 (patch) | |
tree | 9205e6d96e42c88ea589d29bba78585b2df023f4 /media/libstagefright/chromium_http | |
parent | 95068be1426dc0a4dc856cf9e35550c31b901711 (diff) | |
download | frameworks_av-63d794763a680c29edccce3a6fac3d6d9c13c8e3.zip frameworks_av-63d794763a680c29edccce3a6fac3d6d9c13c8e3.tar.gz frameworks_av-63d794763a680c29edccce3a6fac3d6d9c13c8e3.tar.bz2 |
Merge Chromium at r11.0.696.0: Using setter instead of direct variable access
Members in UrlRequestContext was made private in upstream CL:
http://src.chromium.org/viewvc/chrome/trunk/src/net/url_request/url_request_context.h?view=diff&pathrev=77261&r1=75164&r2=75165
Change-Id: I412ddf36b0818e59b9b3ae428407d562facd4785
Diffstat (limited to 'media/libstagefright/chromium_http')
-rw-r--r-- | media/libstagefright/chromium_http/support.cpp | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/media/libstagefright/chromium_http/support.cpp b/media/libstagefright/chromium_http/support.cpp index ed6846c..55c82ed 100644 --- a/media/libstagefright/chromium_http/support.cpp +++ b/media/libstagefright/chromium_http/support.cpp @@ -112,31 +112,31 @@ SfRequestContext::SfRequestContext() { mUserAgent = ua.c_str(); - net_log_ = new SfNetLog; + set_net_log(new SfNetLog()); - host_resolver_ = + set_host_resolver( net::CreateSystemHostResolver( net::HostResolver::kDefaultParallelism, NULL /* resolver_proc */, - net_log_); + net_log())); - ssl_config_service_ = - net::SSLConfigService::CreateSystemSSLConfigService(); + set_ssl_config_service( + net::SSLConfigService::CreateSystemSSLConfigService()); - proxy_service_ = net::ProxyService::CreateWithoutProxyResolver( - new net::ProxyConfigServiceAndroid, net_log_); + set_proxy_service(net::ProxyService::CreateWithoutProxyResolver( + new net::ProxyConfigServiceAndroid, net_log())); - http_transaction_factory_ = new net::HttpCache( - host_resolver_, + set_http_transaction_factory(new net::HttpCache( + host_resolver(), new net::CertVerifier(), - dnsrr_resolver_, - dns_cert_checker_.get(), - proxy_service_.get(), - ssl_config_service_.get(), - net::HttpAuthHandlerFactory::CreateDefault(host_resolver_), - network_delegate_, - net_log_, - NULL); // backend_factory + dnsrr_resolver(), + dns_cert_checker(), + proxy_service(), + ssl_config_service(), + net::HttpAuthHandlerFactory::CreateDefault(host_resolver()), + network_delegate(), + net_log(), + NULL)); // backend_factory } const std::string &SfRequestContext::GetUserAgent(const GURL &url) const { |