diff options
| author | mmenke <mmenke@chromium.org> | 2015-10-28 13:28:09 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-28 20:28:52 +0000 |
| commit | d76f6c556e4f24218ee0a66e4208151aaff13f40 (patch) | |
| tree | 73e614a52707d4ac667ce3fe9e01a0d32d751a0c /blimp/engine | |
| parent | 373dba749956e88fc2a40d846cc176f4421fbafb (diff) | |
| download | chromium_src-d76f6c556e4f24218ee0a66e4208151aaff13f40.zip chromium_src-d76f6c556e4f24218ee0a66e4208151aaff13f40.tar.gz chromium_src-d76f6c556e4f24218ee0a66e4208151aaff13f40.tar.bz2 | |
Make HttpCache constructors take scoped_ptrs.
BUG=479898
Review URL: https://codereview.chromium.org/1406203008
Cr-Commit-Position: refs/heads/master@{#356630}
Diffstat (limited to 'blimp/engine')
| -rw-r--r-- | blimp/engine/browser/blimp_url_request_context_getter.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/blimp/engine/browser/blimp_url_request_context_getter.cc b/blimp/engine/browser/blimp_url_request_context_getter.cc index f2bc1de..93a4dda 100644 --- a/blimp/engine/browser/blimp_url_request_context_getter.cc +++ b/blimp/engine/browser/blimp_url_request_context_getter.cc @@ -142,11 +142,11 @@ net::URLRequestContext* BlimpURLRequestContextGetter::GetURLRequestContext() { make_scoped_ptr(new net::HttpServerPropertiesImpl())); base::FilePath cache_path = base_path_.Append(FILE_PATH_LITERAL("Cache")); - net::HttpCache::DefaultBackend* main_backend = + scoped_ptr<net::HttpCache::DefaultBackend> main_backend( new net::HttpCache::DefaultBackend( net::DISK_CACHE, net::CACHE_BACKEND_DEFAULT, cache_path, 0, content::BrowserThread::GetMessageLoopProxyForThread( - content::BrowserThread::CACHE)); + content::BrowserThread::CACHE))); net::HttpNetworkSession::Params network_session_params; network_session_params.cert_verifier = @@ -183,7 +183,7 @@ net::URLRequestContext* BlimpURLRequestContextGetter::GetURLRequestContext() { storage_->set_http_network_session( make_scoped_ptr(new net::HttpNetworkSession(network_session_params))); storage_->set_http_transaction_factory(make_scoped_ptr(new net::HttpCache( - storage_->http_network_session(), main_backend, true))); + storage_->http_network_session(), main_backend.Pass(), true))); scoped_ptr<net::URLRequestJobFactoryImpl> job_factory( new net::URLRequestJobFactoryImpl()); |