diff options
| author | rvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-14 19:05:33 +0000 |
|---|---|---|
| committer | rvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-14 19:05:33 +0000 |
| commit | 6a98903971dc62cbb7c67510ea559a51d21222c7 (patch) | |
| tree | f9a9fe4e70dbfe11ae1dcfa28c1969d06d6bcc5b /net/http/http_cache_unittest.cc | |
| parent | e518616f8e5f78485c144591d2c78da6bf2ad175 (diff) | |
| download | chromium_src-6a98903971dc62cbb7c67510ea559a51d21222c7.zip chromium_src-6a98903971dc62cbb7c67510ea559a51d21222c7.tar.gz chromium_src-6a98903971dc62cbb7c67510ea559a51d21222c7.tar.bz2 | |
Reland 49600 - Http cache: Remove deprecated code.
BUG=26729
TEST=current tests
Review URL: http://codereview.chromium.org/2776007
TBR=rvargas@google.com
Review URL: http://codereview.chromium.org/2809004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49706 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http/http_cache_unittest.cc')
| -rw-r--r-- | net/http/http_cache_unittest.cc | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/net/http/http_cache_unittest.cc b/net/http/http_cache_unittest.cc index 4337d3b..ed2f377 100644 --- a/net/http/http_cache_unittest.cc +++ b/net/http/http_cache_unittest.cc @@ -591,7 +591,11 @@ class MockHttpCache { return static_cast<MockNetworkLayer*>(http_cache_.network_layer()); } MockDiskCache* disk_cache() { - return static_cast<MockDiskCache*>(http_cache_.GetBackend()); + TestCompletionCallback cb; + disk_cache::Backend* backend; + int rv = http_cache_.GetBackend(&backend, &cb); + rv = cb.GetResult(rv); + return (rv == net::OK) ? static_cast<MockDiskCache*>(backend) : NULL; } // Helper function for reading response info from the disk cache. @@ -1018,8 +1022,11 @@ TEST(HttpCache, CreateThenDestroy) { TEST(HttpCache, GetBackend) { MockHttpCache cache(net::HttpCache::DefaultBackend::InMemory(0)); + disk_cache::Backend* backend; + TestCompletionCallback cb; // This will lazily initialize the backend. - EXPECT_TRUE(cache.http_cache()->GetBackend()); + int rv = cache.http_cache()->GetBackend(&backend, &cb); + EXPECT_EQ(net::OK, cb.GetResult(rv)); } TEST(HttpCache, SimpleGET) { @@ -1076,7 +1083,7 @@ TEST(HttpCache, SimpleGETNoDiskCache2) { RunTransactionTest(cache.http_cache(), kSimpleGET_Transaction); EXPECT_EQ(1, cache.network_layer()->transaction_count()); - EXPECT_FALSE(cache.http_cache()->GetBackend()); + EXPECT_FALSE(cache.http_cache()->GetCurrentBackend()); } TEST(HttpCache, SimpleGETWithDiskFailures) { |