Index: content/browser/appcache/appcache_disk_cache.cc |
diff --git a/content/browser/appcache/appcache_disk_cache.cc b/content/browser/appcache/appcache_disk_cache.cc |
index 03d348c76bba246197ddaddad410ffccb63caa49..46f406eb6997c6815c25cd69fe669cae45799950 100644 |
--- a/content/browser/appcache/appcache_disk_cache.cc |
+++ b/content/browser/appcache/appcache_disk_cache.cc |
@@ -198,12 +198,8 @@ |
}; |
AppCacheDiskCache::AppCacheDiskCache() |
-#if defined(APPCACHE_USE_SIMPLE_CACHE) |
- : AppCacheDiskCache(true) |
-#else |
- : AppCacheDiskCache(false) |
-#endif |
-{ |
+ : is_disabled_(false), |
+ weak_factory_(this) { |
} |
AppCacheDiskCache::~AppCacheDiskCache() { |
@@ -308,12 +304,6 @@ |
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), |
@@ -343,10 +333,14 @@ |
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, |