diff options
author | Kristian Monsen <kristianm@google.com> | 2011-07-01 08:04:11 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-07-01 08:04:11 -0700 |
commit | cebcdaef5b559f4db2a9d8b305d9d7da03525b62 (patch) | |
tree | 8b512ebf1f8497121366a743aec16bf6ac176efa /media/libstagefright/chromium_http | |
parent | 0f30bd90272c818aa37c0bb22d22eaa7d3689879 (diff) | |
parent | 63d794763a680c29edccce3a6fac3d6d9c13c8e3 (diff) | |
download | frameworks_av-cebcdaef5b559f4db2a9d8b305d9d7da03525b62.zip frameworks_av-cebcdaef5b559f4db2a9d8b305d9d7da03525b62.tar.gz frameworks_av-cebcdaef5b559f4db2a9d8b305d9d7da03525b62.tar.bz2 |
Merge changes I7e8401a4,I412ddf36
* changes:
Merge Chromium at r11.0.696.0: New autofill strings
Merge Chromium at r11.0.696.0: Using setter instead of direct variable access
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 967f126..f4b3668 100644 --- a/media/libstagefright/chromium_http/support.cpp +++ b/media/libstagefright/chromium_http/support.cpp @@ -115,31 +115,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 { |