Test cache creation retry via public interface only.

net/disk_cache/disk_cache_test_base.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/disk_cache/disk_cache_test_base.h"
 
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
 #include "net/base/io_buffer.h"
@@ skipping 241 matching lines @@
 
   if (!cache_thread_.IsRunning()) {
     ASSERT_TRUE(cache_thread_.StartWithOptions(
                     base::Thread::Options(MessageLoop::TYPE_IO, 0)));
   }
   ASSERT_TRUE(cache_thread_.message_loop() != NULL);
 
   CreateBackend(disk_cache::kNoRandom, &cache_thread_);
 }
 
-// Testing backend creation retry logic is hard because the CacheCreator and
-// cache backend(s) are tightly coupled. So we take the default backend often.
-// Tests themselves need to be adjusted for platforms where the BackendImpl is
-// not the default backend.
-void DiskCacheTestWithCache::InitDefaultCacheViaCreator() {
+void DiskCacheTestWithCache::CreateCacheViaPublicInterface() {
   if (!cache_thread_.IsRunning()) {
     ASSERT_TRUE(cache_thread_.StartWithOptions(
                     base::Thread::Options(MessageLoop::TYPE_IO, 0)));
   }
   ASSERT_TRUE(cache_thread_.message_loop() != NULL);
 
   net::TestCompletionCallback cb;
-  disk_cache::CacheCreator* creator = new disk_cache::CacheCreator(
-      cache_path_, true, 0, net::DISK_CACHE, disk_cache::kNoRandom,
-      cache_thread_.message_loop_proxy(), NULL, &cache_, cb.callback());
-  int rv = creator->Run();
+  int rv = disk_cache::CreateCacheBackend(net::DISK_CACHE, cache_path_, 0, true,
+                                          cache_thread_.message_loop_proxy(),
+                                          NULL, &cache_, cb.callback());
   ASSERT_EQ(net::OK, cb.GetResult(rv));
 }
 
 void DiskCacheTestWithCache::CreateBackend(uint32 flags, base::Thread* thread) {
   base::MessageLoopProxy* runner;
   if (use_current_thread_)
     runner = base::MessageLoopProxy::current();
   else
     runner = thread->message_loop_proxy();
 
@@ skipping 19 matching lines @@
     EXPECT_TRUE(cache_impl_->SetMaxSize(size_));
   if (new_eviction_)
     cache_impl_->SetNewEviction();
   cache_impl_->SetType(type_);
   cache_impl_->SetFlags(flags);
   net::TestCompletionCallback cb;
   int rv = cache_impl_->Init(cb.callback());
   ASSERT_EQ(net::OK, cb.GetResult(rv));
   cache_ = cache_impl_;
 }