[Storage] Blob Storage Refactoring pt 1

content/browser/service_worker/service_worker_cache_listener.h

Index: content/browser/service_worker/service_worker_cache_listener.h
diff --git a/content/browser/service_worker/service_worker_cache_listener.h b/content/browser/service_worker/service_worker_cache_listener.h
index 78527514ad39b1324c496cdec2a31e3bbc4bbf31..046cec5324ad90adfb29e0aa3809db7718293911 100644
--- a/content/browser/service_worker/service_worker_cache_listener.h
+++ b/content/browser/service_worker/service_worker_cache_listener.h
@@ -68,7 +68,7 @@ class ServiceWorkerCacheListener : public EmbeddedWorkerInstance::Listener {
  private:
   typedef int32_t CacheID;  // TODO(jkarlin): Bump to 64 bit.
   typedef std::map<CacheID, scoped_refptr<ServiceWorkerCache>> IDToCacheMap;
-  typedef std::map<std::string, std::list<storage::BlobDataHandle>>
+  typedef std::map<std::string, std::list<storage::BlobDataSnapshotHandle>>
       UUIDToBlobDataHandleList;
 
   void Send(const IPC::Message& message);
@@ -102,7 +102,7 @@ class ServiceWorkerCacheListener : public EmbeddedWorkerInstance::Listener {
       int request_id,
       ServiceWorkerCache::ErrorType error,
       scoped_ptr<ServiceWorkerResponse> response,
-      scoped_ptr<storage::BlobDataHandle> blob_data_handle);
+      scoped_ptr<storage::BlobDataSnapshotHandle> blob_data_handle);
 
   // Cache callbacks
   void OnCacheMatchCallback(
@@ -110,7 +110,7 @@ class ServiceWorkerCacheListener : public EmbeddedWorkerInstance::Listener {
       const scoped_refptr<ServiceWorkerCache>& cache,
       ServiceWorkerCache::ErrorType error,
       scoped_ptr<ServiceWorkerResponse> response,
-      scoped_ptr<storage::BlobDataHandle> blob_data_handle);
+      scoped_ptr<storage::BlobDataSnapshotHandle> blob_data_handle);
   void OnCacheKeysCallback(int request_id,
                            const scoped_refptr<ServiceWorkerCache>& cache,
                            ServiceWorkerCache::ErrorType error,
@@ -118,11 +118,12 @@ class ServiceWorkerCacheListener : public EmbeddedWorkerInstance::Listener {
   void OnCacheDeleteCallback(int request_id,
                              const scoped_refptr<ServiceWorkerCache>& cache,
                              ServiceWorkerCache::ErrorType error);
-  void OnCachePutCallback(int request_id,
-                          const scoped_refptr<ServiceWorkerCache>& cache,
-                          ServiceWorkerCache::ErrorType error,
-                          scoped_ptr<ServiceWorkerResponse> response,
-                          scoped_ptr<storage::BlobDataHandle> blob_data_handle);
+  void OnCachePutCallback(
+      int request_id,
+      const scoped_refptr<ServiceWorkerCache>& cache,
+      ServiceWorkerCache::ErrorType error,
+      scoped_ptr<ServiceWorkerResponse> response,
+      scoped_ptr<storage::BlobDataSnapshotHandle> blob_data_handle);
 
   // Hangs onto a scoped_refptr for the cache if it isn't already doing so.
   // Returns a unique cache_id. Call DropCacheReference when the client is done
@@ -133,7 +134,7 @@ class ServiceWorkerCacheListener : public EmbeddedWorkerInstance::Listener {
   // Stores blob handles while waiting for acknowledgement of receipt from the
   // renderer.
   void StoreBlobDataHandle(
-      scoped_ptr<storage::BlobDataHandle> blob_data_handle);
+      scoped_ptr<storage::BlobDataSnapshotHandle> blob_data_handle);
   void DropBlobDataHandle(std::string uuid);
 
   // The ServiceWorkerVersion to use for messaging back to the renderer thread.