CacheStorage: Clean up CacheStorageCache

BUG=n/a
TEST=compile

Review URL: https://codereview.chromium.org/1077323003

Cr-Commit-Position: refs/heads/master@{#326994}

content/browser/cache_storage/cache_storage_cache.cc

@@ -15,6 +15,7 @@
 #include "content/browser/cache_storage/cache_storage_scheduler.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/common/referrer.h"
+#include "net/base/completion_callback.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "net/disk_cache/disk_cache.h"
@@ -30,7 +31,6 @@ namespace content {
 
 namespace {
 
-typedef base::Callback<void(bool)> BoolCallback;
 typedef base::Callback<void(disk_cache::ScopedEntryPtr, bool)>
     EntryBoolCallback;
 typedef base::Callback<void(scoped_ptr<CacheMetadata>)> MetadataCallback;
@@ -273,7 +273,7 @@ class CacheStorageCache::BlobReader : public net::URLRequest::Delegate {
 
 // The state needed to pass between CacheStorageCache::Keys callbacks.
 struct CacheStorageCache::KeysContext {
-  KeysContext(const CacheStorageCache::RequestsCallback& callback)
+  explicit KeysContext(const CacheStorageCache::RequestsCallback& callback)
       : original_callback(callback),
         out_keys(new CacheStorageCache::Requests()),
         enumerated_entry(NULL) {}

content/browser/cache_storage/cache_storage_cache.h

@@ -5,7 +5,7 @@
 #ifndef CONTENT_BROWSER_CACHE_STORAGE_CACHE_STORAGE_CACHE_H_
 #define CONTENT_BROWSER_CACHE_STORAGE_CACHE_STORAGE_CACHE_H_
 
-#include <list>
+#include <vector>
 
 #include "base/callback.h"
 #include "base/files/file_path.h"
@@ -13,7 +13,6 @@
 #include "base/memory/weak_ptr.h"
 #include "content/common/cache_storage/cache_storage_types.h"
 #include "content/common/service_worker/service_worker_types.h"
-#include "net/base/completion_callback.h"
 #include "net/disk_cache/disk_cache.h"
 
 namespace net {
@@ -22,14 +21,13 @@ class IOBufferWithSize;
 }
 
 namespace storage {
-class BlobDataBuilder;
 class BlobDataHandle;
 class BlobStorageContext;
 class QuotaManagerProxy;
 }
 
 namespace content {
-class ChromeBlobStorageContext;
+
 class CacheMetadata;
 class CacheStorageScheduler;
 class TestCacheStorageCache;
@@ -51,7 +49,6 @@ class CONTENT_EXPORT CacheStorageCache
     ERROR_TYPE_LAST = ERROR_TYPE_NOT_FOUND
   };
 
-  enum EntryIndex { INDEX_HEADERS = 0, INDEX_RESPONSE_BODY };
   typedef base::Callback<void(ErrorType)> ErrorCallback;
   typedef base::Callback<void(ErrorType,
                               scoped_ptr<ServiceWorkerResponse>,