Create blobs from Disk Cache entries.

content/browser/cache_storage/cache_storage_cache.h

Index: content/browser/cache_storage/cache_storage_cache.h
diff --git a/content/browser/cache_storage/cache_storage_cache.h b/content/browser/cache_storage/cache_storage_cache.h
index ccc2d1c839e6167a18e35634c2f61d5070ba772c..810c3e30705856e6cbfa12cd344b497ab871ba63 100644
--- a/content/browser/cache_storage/cache_storage_cache.h
+++ b/content/browser/cache_storage/cache_storage_cache.h
@@ -104,7 +104,6 @@ class CONTENT_EXPORT CacheStorageCache
 
   class BlobReader;
   struct KeysContext;
-  struct MatchContext;
   struct PutContext;
 
   // The backend progresses from uninitialized, to open, to closed, and cannot
@@ -131,12 +130,14 @@ class CONTENT_EXPORT CacheStorageCache
   // Match callbacks
   void MatchImpl(scoped_ptr<ServiceWorkerFetchRequest> request,
                  const ResponseCallback& callback);
-  void MatchDidOpenEntry(scoped_ptr<MatchContext> match_context, int rv);
-  void MatchDidReadMetadata(scoped_ptr<MatchContext> match_context,
+  void MatchDidOpenEntry(scoped_ptr<ServiceWorkerFetchRequest> request,
+                         const ResponseCallback& callback,
+                         scoped_ptr<disk_cache::Entry*> entry_ptr,
+                         int rv);
+  void MatchDidReadMetadata(scoped_ptr<ServiceWorkerFetchRequest> request,
+                            const ResponseCallback& callback,
+                            disk_cache::ScopedEntryPtr entry,
                             scoped_ptr<CacheMetadata> headers);
-  void MatchDidReadResponseBodyData(scoped_ptr<MatchContext> match_context,
-                                    int rv);
-  void MatchDoneWithBody(scoped_ptr<MatchContext> match_context);
 
   // Puts the request and response object in the cache. The response body (if
   // present) is stored in the cache, but not the request body. Returns OK on
@@ -146,7 +147,9 @@ class CONTENT_EXPORT CacheStorageCache
   void PutImpl(scoped_ptr<PutContext> put_context);
   void PutDidDelete(scoped_ptr<PutContext> put_context,
                     CacheStorageError delete_error);
-  void PutDidCreateEntry(scoped_ptr<PutContext> put_context, int rv);
+  void PutDidCreateEntry(scoped_ptr<disk_cache::Entry*> entry_ptr,
+                         scoped_ptr<PutContext> put_context,
+                         int rv);
   void PutDidWriteHeaders(scoped_ptr<PutContext> put_context,
                           int expected_bytes,
                           int rv);