diff options
author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-16 18:18:00 +0000 |
---|---|---|
committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-16 18:18:00 +0000 |
commit | c3a420945071a54182d63de697be0a80f5dab0c0 (patch) | |
tree | 5b6a16e60c10411f0ed2a5171c8139e02e29d11a /net/proxy | |
parent | 1d20cdf4cb74b3a1b47c7bd62d3e3d17be4c6013 (diff) | |
download | chromium_src-c3a420945071a54182d63de697be0a80f5dab0c0.zip chromium_src-c3a420945071a54182d63de697be0a80f5dab0c0.tar.gz chromium_src-c3a420945071a54182d63de697be0a80f5dab0c0.tar.bz2 |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75143 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 3dc4494..56cccb1 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; - host_resolver_ = + set_host_resolver( CreateSystemHostResolver(HostResolver::kDefaultParallelism, - NULL, NULL); - cert_verifier_ = new CertVerifier; - proxy_service_ = ProxyService::CreateFixed(no_proxy); - ssl_config_service_ = new SSLConfigServiceDefaults; + NULL, NULL)); + set_cert_verifier(new CertVerifier); + set_proxy_service(ProxyService::CreateFixed(no_proxy)); + set_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)); - http_transaction_factory_ = new HttpCache( + set_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(); } }; |