Revert of ServiceWorker: Use SimpleCache for the script cache

content/browser/appcache/appcache_disk_cache.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 "content/browser/appcache/appcache_disk_cache.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
@@ skipping 180 matching lines @@
     callback_.Run(rv);
   }
 
   base::WeakPtr<AppCacheDiskCache> owner_;
   Entry** entry_;
   net::CompletionCallback callback_;
   disk_cache::Entry* entry_ptr_;
 };
 
 AppCacheDiskCache::AppCacheDiskCache()
-#if defined(APPCACHE_USE_SIMPLE_CACHE)
-    : AppCacheDiskCache(true)
-#else
-    : AppCacheDiskCache(false)
-#endif
-{
+    : is_disabled_(false),
+      weak_factory_(this) {
 }
 
 AppCacheDiskCache::~AppCacheDiskCache() {
   Disable();
 }
 
 int AppCacheDiskCache::InitWithDiskBackend(
     const base::FilePath& disk_cache_directory,
     int disk_cache_size,
     bool force,
@@ skipping 84 matching lines @@
     pending_calls_.push_back(PendingCall(DOOM, key, NULL, callback));
     return net::ERR_IO_PENDING;
   }
 
   if (!disk_cache_)
     return net::ERR_FAILED;
 
   return ActiveCall::DoomEntry(weak_factory_.GetWeakPtr(), key, callback);
 }
 
-AppCacheDiskCache::AppCacheDiskCache(bool use_simple_cache)
-    : use_simple_cache_(use_simple_cache),
-      is_disabled_(false),
-      weak_factory_(this) {
-}
-
 AppCacheDiskCache::PendingCall::PendingCall()
     : call_type(CREATE),
       key(0),
       entry(NULL) {
 }
 
 AppCacheDiskCache::PendingCall::PendingCall(PendingCallType call_type,
     int64 key,
     Entry** entry,
     const net::CompletionCallback& callback)
     : call_type(call_type),
       key(key),
       entry(entry),
       callback(callback) {
 }
 
 AppCacheDiskCache::PendingCall::~PendingCall() {}
 
 int AppCacheDiskCache::Init(
     net::CacheType cache_type,
     const base::FilePath& cache_directory,
     int cache_size,
     bool force,
     const scoped_refptr<base::SingleThreadTaskRunner>& cache_thread,
     const net::CompletionCallback& callback) {
   DCHECK(!is_initializing() && !disk_cache_.get());
   is_disabled_ = false;
   create_backend_callback_ = new CreateBackendCallbackShim(this);
 
+#if defined(APPCACHE_USE_SIMPLE_CACHE)
+  const net::BackendType backend_type = net::CACHE_BACKEND_SIMPLE;
+#else
+  const net::BackendType backend_type = net::CACHE_BACKEND_DEFAULT;
+#endif
   int rv = disk_cache::CreateCacheBackend(
       cache_type,
-      use_simple_cache_ ? net::CACHE_BACKEND_SIMPLE
-                        : net::CACHE_BACKEND_DEFAULT,
+      backend_type,
       cache_directory,
       cache_size,
       force,
       cache_thread,
       NULL,
       &(create_backend_callback_->backend_ptr_),
       base::Bind(&CreateBackendCallbackShim::Callback,
                  create_backend_callback_));
   if (rv == net::ERR_IO_PENDING)
     init_callback_ = callback;
@@ skipping 32 matching lines @@
         NOTREACHED();
         break;
     }
     if (rv != net::ERR_IO_PENDING)
       iter->callback.Run(rv);
   }
   pending_calls_.clear();
 }
 
 }  // namespace content