diff options
author | oshima@google.com <oshima@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-12 03:57:44 +0000 |
---|---|---|
committer | oshima@google.com <oshima@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-12 03:57:44 +0000 |
commit | 543a0683e2878c88760d3aace0ebf6fe498082bc (patch) | |
tree | e0bca0cf5e7db75c82c241f60f6fb15a6625d536 /net/proxy | |
parent | f275bb18362be416decc58033f36dcd1988217e8 (diff) | |
download | chromium_src-543a0683e2878c88760d3aace0ebf6fe498082bc.zip chromium_src-543a0683e2878c88760d3aace0ebf6fe498082bc.tar.gz chromium_src-543a0683e2878c88760d3aace0ebf6fe498082bc.tar.bz2 |
Revert r74632 "Reland r74561 after fixing ChromeOS build breakage."
This reverts commit f19e6d524e086ed8182a475680e931a9a870d2a8.
TBR=willchan@chromium.org
BUG=none
TEST=chromeos pfq bot should cycle green
Review URL: http://codereview.chromium.org/6512009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74728 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy')
-rw-r--r-- | net/proxy/proxy_script_fetcher_impl_unittest.cc | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/net/proxy/proxy_script_fetcher_impl_unittest.cc b/net/proxy/proxy_script_fetcher_impl_unittest.cc index e0f0c906..ce92986 100644 --- a/net/proxy/proxy_script_fetcher_impl_unittest.cc +++ b/net/proxy/proxy_script_fetcher_impl_unittest.cc @@ -41,30 +41,30 @@ class RequestContext : public URLRequestContext { public: RequestContext() { ProxyConfig no_proxy; - set_host_resolver( + host_resolver_ = CreateSystemHostResolver(HostResolver::kDefaultParallelism, - NULL, NULL)); - set_cert_verifier(new CertVerifier); - set_proxy_service(ProxyService::CreateFixed(no_proxy)); - set_ssl_config_service(new SSLConfigServiceDefaults); + NULL, NULL); + cert_verifier_ = new CertVerifier; + proxy_service_ = ProxyService::CreateFixed(no_proxy); + ssl_config_service_ = new SSLConfigServiceDefaults; HttpNetworkSession::Params params; - params.host_resolver = host_resolver(); - params.cert_verifier = cert_verifier(); - params.proxy_service = proxy_service(); - params.ssl_config_service = ssl_config_service(); + params.host_resolver = host_resolver_; + params.cert_verifier = cert_verifier_; + params.proxy_service = proxy_service_; + params.ssl_config_service = ssl_config_service_; scoped_refptr<HttpNetworkSession> network_session( new HttpNetworkSession(params)); - set_http_transaction_factory(new HttpCache( + http_transaction_factory_ = new HttpCache( network_session, - HttpCache::DefaultBackend::InMemory(0))); + HttpCache::DefaultBackend::InMemory(0)); } private: ~RequestContext() { - delete http_transaction_factory(); - delete cert_verifier(); - delete host_resolver(); + delete http_transaction_factory_; + delete cert_verifier_; + delete host_resolver_; } }; |