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 /net/http/mock_http_cache.cc | |
| 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 'net/http/mock_http_cache.cc')
| -rw-r--r-- | net/http/mock_http_cache.cc | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/net/http/mock_http_cache.cc b/net/http/mock_http_cache.cc index 184270a..ce49d33 100644 --- a/net/http/mock_http_cache.cc +++ b/net/http/mock_http_cache.cc @@ -524,14 +524,10 @@ int MockBackendFactory::CreateBackend(NetLog* net_log, //----------------------------------------------------------------------------- -MockHttpCache::MockHttpCache() - : MockHttpCache(make_scoped_ptr(new MockBackendFactory())) {} - -MockHttpCache::MockHttpCache( - scoped_ptr<HttpCache::BackendFactory> disk_cache_factory) - : http_cache_(make_scoped_ptr(new MockNetworkLayer()), - disk_cache_factory.Pass(), - true) {} +MockHttpCache::MockHttpCache() : MockHttpCache(new MockBackendFactory()) {} + +MockHttpCache::MockHttpCache(HttpCache::BackendFactory* disk_cache_factory) + : http_cache_(new MockNetworkLayer(), nullptr, disk_cache_factory, true) {} disk_cache::Backend* MockHttpCache::backend() { TestCompletionCallback cb; |