diff options
| author | dgozman <dgozman@chromium.org> | 2015-10-28 13:43:43 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-28 20:44:20 +0000 |
| commit | 2c4e6b4808de2786aa895d8408c96d45fb6a5738 (patch) | |
| tree | 4a9d63815a6d0d3300c3ea169c4464301b98c226 /blimp/engine | |
| parent | 7a13051ffc1fa68ad7a3f13acc83385f3a974e05 (diff) | |
| download | chromium_src-2c4e6b4808de2786aa895d8408c96d45fb6a5738.zip chromium_src-2c4e6b4808de2786aa895d8408c96d45fb6a5738.tar.gz chromium_src-2c4e6b4808de2786aa895d8408c96d45fb6a5738.tar.bz2 | |
Revert of Make HttpCache constructors take scoped_ptrs. (patchset #6 id:120001 of https://codereview.chromium.org/1406203008/ )
Reason for revert:
Broke iOS Device (ninja) compilation. See https://build.chromium.org/p/chromium.mac/builders/iOS_Device_%28ninja%29/builds/27454
Original issue's description:
> Make HttpCache constructors take scoped_ptrs.
>
> BUG=479898
>
> Committed: https://crrev.com/d76f6c556e4f24218ee0a66e4208151aaff13f40
> Cr-Commit-Position: refs/heads/master@{#356630}
TBR=pauljensen@chromium.org,sgurun@chromium.org,kmarshall@chromium.org,peter@chromium.org,mmenke@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=479898
Review URL: https://codereview.chromium.org/1425533004
Cr-Commit-Position: refs/heads/master@{#356635}
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 93a4dda..f2bc1de 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")); - scoped_ptr<net::HttpCache::DefaultBackend> main_backend( + 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.Pass(), true))); + storage_->http_network_session(), main_backend, true))); scoped_ptr<net::URLRequestJobFactoryImpl> job_factory( new net::URLRequestJobFactoryImpl()); |