Revert of CacheStorage: Merge CacheStorageListener into CacheStorageDispatcherHost (1)

content/browser/cache_storage/cache_storage_listener.h

Index: content/browser/cache_storage/cache_storage_listener.h
diff --git a/content/browser/cache_storage/cache_storage_listener.h b/content/browser/cache_storage/cache_storage_listener.h
index f13b40f718dafa61f2688d4964445c0874c23c35..14c5a46f554d798111975d417cb890a353d81f78 100644
--- a/content/browser/cache_storage/cache_storage_listener.h
+++ b/content/browser/cache_storage/cache_storage_listener.h
@@ -32,6 +32,26 @@
   bool OnMessageReceived(const IPC::Message& message);
 
  private:
+  // The message receiver functions for the CacheStorage API:
+  void OnCacheStorageHas(int thread_id,
+                         int request_id,
+                         const GURL& origin,
+                         const base::string16& cache_name);
+  void OnCacheStorageOpen(int thread_id,
+                          int request_id,
+                          const GURL& origin,
+                          const base::string16& cache_name);
+  void OnCacheStorageDelete(int thread_id,
+                            int request_id,
+                            const GURL& origin,
+                            const base::string16& cache_name);
+  void OnCacheStorageKeys(int thread_id, int request_id, const GURL& origin);
+  void OnCacheStorageMatch(int thread_id,
+                           int request_id,
+                           const GURL& origin,
+                           const ServiceWorkerFetchRequest& request,
+                           const CacheStorageCacheQueryParams& match_params);
+
   // The message receiver functions for the Cache API:
   void OnCacheMatch(int thread_id,
                     int request_id,
@@ -56,14 +76,36 @@
   void OnBlobDataHandled(const std::string& uuid);
 
  private:
-  friend class CacheStorageDispatcherHost;
-
   typedef int32_t CacheID;  // TODO(jkarlin): Bump to 64 bit.
   typedef std::map<CacheID, scoped_refptr<CacheStorageCache>> IDToCacheMap;
   typedef std::map<std::string, std::list<storage::BlobDataHandle>>
       UUIDToBlobDataHandleList;
 
   void Send(IPC::Message* message);
+
+  // CacheStorageManager callbacks
+  void OnCacheStorageHasCallback(int thread_id,
+                                 int request_id,
+                                 bool has_cache,
+                                 CacheStorage::CacheStorageError error);
+  void OnCacheStorageOpenCallback(int thread_id,
+                                  int request_id,
+                                  const scoped_refptr<CacheStorageCache>& cache,
+                                  CacheStorage::CacheStorageError error);
+  void OnCacheStorageDeleteCallback(int thread_id,
+                                    int request_id,
+                                    bool deleted,
+                                    CacheStorage::CacheStorageError error);
+  void OnCacheStorageKeysCallback(int thread_id,
+                                  int request_id,
+                                  const std::vector<std::string>& strings,
+                                  CacheStorage::CacheStorageError error);
+  void OnCacheStorageMatchCallback(
+      int thread_id,
+      int request_id,
+      CacheStorageCache::ErrorType error,
+      scoped_ptr<ServiceWorkerResponse> response,
+      scoped_ptr<storage::BlobDataHandle> blob_data_handle);
 
   // Cache callbacks
   void OnCacheMatchCallback(