diff options
author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-16 18:56:09 +0000 |
---|---|---|
committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-16 18:56:09 +0000 |
commit | 84a12e448f6e54b2ed026e2b34bb73474e6dcf72 (patch) | |
tree | 2d60323b17ef47a7d7d1c7094e7264cbfae44a23 /net/proxy | |
parent | fc160d4b5fe40e5deb3b722fc27dd17a9dc49cd5 (diff) | |
download | chromium_src-84a12e448f6e54b2ed026e2b34bb73474e6dcf72.zip chromium_src-84a12e448f6e54b2ed026e2b34bb73474e6dcf72.tar.gz chromium_src-84a12e448f6e54b2ed026e2b34bb73474e6dcf72.tar.bz2 |
Revert 75143 - Reland r74842
The bug was that the ProfilePolicyContext was getting initialized before the ProfileImplIOData::Handle was initialized.
BUG=67237
TEST=none
Review URL: http://codereview.chromium.org/6526029
TBR=willchan@chromium.org
Review URL: http://codereview.chromium.org/6480120
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75152 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 56cccb1..3dc4494 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_; } }; |