Index: net/disk_cache/backend_unittest.cc |
diff --git a/net/disk_cache/backend_unittest.cc b/net/disk_cache/backend_unittest.cc |
index db33c8e6ae9d520f4a691e17b0cd90e1cf6e4fad..c349c1ed87f3f726bc8521fb2db65b39e2956ce9 100644 |
--- a/net/disk_cache/backend_unittest.cc |
+++ b/net/disk_cache/backend_unittest.cc |
@@ -219,9 +219,9 @@ TEST_F(DiskCacheTest, CreateBackend) { |
// Test the private factory methods. |
rvargas (doing something else)
2013/03/13 19:36:01
If there's no private factory method, this part of
pasko-google - do not use
2013/03/18 15:47:07
Done.
|
disk_cache::Backend* cache = NULL; |
- int rv = disk_cache::BackendImpl::CreateBackend( |
- cache_path_, false, 0, net::DISK_CACHE, disk_cache::kNoRandom, |
- cache_thread.message_loop_proxy(), NULL, &cache, cb.callback()); |
+ int rv = disk_cache::CreateCacheBackend(net::DISK_CACHE, cache_path_, |
+ 0, false, cache_thread.message_loop_proxy(), NULL, &cache, |
+ cb.callback()); |
ASSERT_EQ(net::OK, cb.GetResult(rv)); |
ASSERT_TRUE(cache); |
delete cache; |
@@ -301,8 +301,8 @@ void DiskCacheBackendTest::BackendShutdownWithPendingFileIO(bool fast) { |
uint32 flags = disk_cache::kNoBuffering; |
if (!fast) |
flags |= disk_cache::kNoRandom; |
- rv = disk_cache::BackendImpl::CreateBackend( |
- cache_path_, false, 0, net::DISK_CACHE, flags, |
+ rv = disk_cache::CreateCacheBackendWithFlags( |
+ net::DISK_CACHE, cache_path_, 0, false, flags, |
base::MessageLoopProxy::current(), NULL, |
&cache, cb.callback()); |
ASSERT_EQ(net::OK, cb.GetResult(rv)); |
@@ -379,8 +379,8 @@ void DiskCacheBackendTest::BackendShutdownWithPendingIO(bool fast) { |
uint32 flags = disk_cache::kNoBuffering; |
if (!fast) |
flags |= disk_cache::kNoRandom; |
- int rv = disk_cache::BackendImpl::CreateBackend( |
- cache_path_, false, 0, net::DISK_CACHE, flags, |
+ int rv = disk_cache::CreateCacheBackendWithFlags( |
+ net::DISK_CACHE, cache_path_, 0, false, flags, |
cache_thread.message_loop_proxy(), NULL, &cache, cb.callback()); |
ASSERT_EQ(net::OK, cb.GetResult(rv)); |
@@ -422,8 +422,8 @@ void DiskCacheBackendTest::BackendShutdownWithPendingCreate(bool fast) { |
disk_cache::Backend* cache; |
disk_cache::BackendFlags flags = |
fast ? disk_cache::kNone : disk_cache::kNoRandom; |
- int rv = disk_cache::BackendImpl::CreateBackend( |
- cache_path_, false, 0, net::DISK_CACHE, flags, |
+ int rv = disk_cache::CreateCacheBackendWithFlags( |
+ net::DISK_CACHE, cache_path_, 0, false, flags, |
cache_thread.message_loop_proxy(), NULL, &cache, cb.callback()); |
ASSERT_EQ(net::OK, cb.GetResult(rv)); |
@@ -461,8 +461,8 @@ TEST_F(DiskCacheTest, TruncatedIndex) { |
net::TestCompletionCallback cb; |
disk_cache::Backend* backend = NULL; |
- int rv = disk_cache::BackendImpl::CreateBackend( |
- cache_path_, false, 0, net::DISK_CACHE, disk_cache::kNone, |
+ int rv = disk_cache::CreateCacheBackend( |
+ net::DISK_CACHE, cache_path_, 0, false, |
cache_thread.message_loop_proxy(), NULL, &backend, cb.callback()); |
ASSERT_NE(net::OK, cb.GetResult(rv)); |
@@ -1555,8 +1555,8 @@ TEST_F(DiskCacheTest, DeleteOld) { |
net::TestCompletionCallback cb; |
disk_cache::Backend* cache; |
- int rv = disk_cache::BackendImpl::CreateBackend( |
- cache_path_, true, 0, net::DISK_CACHE, disk_cache::kNoRandom, |
+ int rv = disk_cache::CreateCacheBackendWithFlags( |
+ net::DISK_CACHE, cache_path_, 0, true, disk_cache::kNoRandom, |
cache_thread.message_loop_proxy(), NULL, &cache, cb.callback()); |
ASSERT_EQ(net::OK, cb.GetResult(rv)); |
@@ -2460,12 +2460,12 @@ TEST_F(DiskCacheTest, MultipleInstances) { |
const int kNumberOfCaches = 2; |
disk_cache::Backend* cache[kNumberOfCaches]; |
- int rv = disk_cache::BackendImpl::CreateBackend( |
- store1.path(), false, 0, net::DISK_CACHE, disk_cache::kNone, |
+ int rv = disk_cache::CreateCacheBackend( |
+ net::DISK_CACHE, store1.path(), 0, false, |
cache_thread.message_loop_proxy(), NULL, &cache[0], cb.callback()); |
ASSERT_EQ(net::OK, cb.GetResult(rv)); |
- rv = disk_cache::BackendImpl::CreateBackend( |
- store2.path(), false, 0, net::MEDIA_CACHE, disk_cache::kNone, |
+ rv = disk_cache::CreateCacheBackend( |
+ net::MEDIA_CACHE, store2.path(), 0, false, |
cache_thread.message_loop_proxy(), NULL, &cache[1], cb.callback()); |
ASSERT_EQ(net::OK, cb.GetResult(rv)); |