Disk cache: Reference CL for the implementation of file format version 3.

net/disk_cache/cache_creator.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 "base/file_util.h"
 #include "base/metrics/field_trial.h"
 #include "base/stringprintf.h"
 #include "net/base/cache_type.h"
 #include "net/base/net_errors.h"
 #include "net/disk_cache/backend_impl.h"
@@ skipping 66 matching lines @@
 
 CacheCreator::~CacheCreator() {
 }
 
 int CacheCreator::Run() {
   // TODO(gavinp,pasko): While simple backend development proceeds, we're only
   // testing it against net::DISK_CACHE. Turn it on for more cache types as
   // appropriate.
   if (backend_type_ == net::CACHE_BACKEND_SIMPLE && type_ == net::DISK_CACHE) {
     disk_cache::SimpleBackendImpl* simple_cache =
-        new disk_cache::SimpleBackendImpl(path_, max_bytes_, type_, thread_,
-                                          net_log_);
+        new disk_cache::SimpleBackendImpl(path_, max_bytes_, type_,
+                                          thread_.get(), net_log_);
     created_cache_ = simple_cache;
     return simple_cache->Init(
         base::Bind(&CacheCreator::OnIOComplete, base::Unretained(this)));
   }
-  DCHECK(backend_type_ == net::CACHE_BACKEND_BLOCKFILE ||
-         backend_type_ == net::CACHE_BACKEND_DEFAULT);
   disk_cache::BackendImpl* new_cache =
-      new disk_cache::BackendImpl(path_, thread_, net_log_);
+      new disk_cache::BackendImpl(path_, thread_.get(), net_log_);
   created_cache_ = new_cache;
   new_cache->SetMaxSize(max_bytes_);
   new_cache->SetType(type_);
   new_cache->SetFlags(flags_);
   int rv = new_cache->Init(
       base::Bind(&CacheCreator::OnIOComplete, base::Unretained(this)));
   DCHECK_EQ(net::ERR_IO_PENDING, rv);
   return rv;
 }
 
@@ skipping 51 matching lines @@
     return *backend ? net::OK : net::ERR_FAILED;
   }
   DCHECK(thread);
   CacheCreator* creator = new CacheCreator(path, force, max_bytes, type,
                                            backend_type, kNone,
                                            thread, net_log, backend, callback);
   return creator->Run();
 }
 
 }  // namespace disk_cache