Separate Simple Backend creation from initialization.

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 250 matching lines @@
 
 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();
 
   if (simple_cache_mode_) {
     net::TestCompletionCallback cb;
-    disk_cache::Backend* simple_backend;
-    // TODO(pasko): split Simple Backend construction from initialization.
-    int rv = disk_cache::SimpleBackendImpl::CreateBackend(cache_path_, size_,
-        type_, disk_cache::kNone, make_scoped_refptr(runner), NULL,
-        &simple_backend, cb.callback());
+    disk_cache::SimpleBackendImpl* simple_backend =
+        new disk_cache::SimpleBackendImpl(cache_path_, size_, type_,
+                                          make_scoped_refptr(runner), NULL);
+    int rv = simple_backend->Init(cb.callback());
     ASSERT_EQ(net::OK, cb.GetResult(rv));
     cache_ = simple_backend;
     return;
   }
 
   if (mask_)
     cache_impl_ = new disk_cache::BackendImpl(cache_path_, mask_, runner, NULL);
   else
     cache_impl_ = new disk_cache::BackendImpl(cache_path_, runner, NULL);
   cache_ = cache_impl_;
   ASSERT_TRUE(NULL != cache_);
   if (size_)
     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_;
 }