[Storage] Blob Storage Refactoring pt 1

content/browser/service_worker/service_worker_cache.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/service_worker/service_worker_cache.h"
 
 #include <string>
 
 #include "base/files/file_path.h"
 #include "base/guid.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/profiler/scoped_tracker.h"
 #include "base/strings/string_util.h"
 #include "content/browser/service_worker/service_worker_cache.pb.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "net/disk_cache/disk_cache.h"
 #include "net/url_request/url_request_context.h"
+#include "storage/browser/blob/blob_data_builder.h"
 #include "storage/browser/blob/blob_data_handle.h"
 #include "storage/browser/blob/blob_storage_context.h"
 #include "storage/browser/blob/blob_url_request_job_factory.h"
 #include "storage/browser/quota/quota_manager_proxy.h"
 #include "third_party/WebKit/public/platform/WebServiceWorkerResponseType.h"
 
 namespace content {
 
 namespace {
 
@@ skipping 306 matching lines @@
   }
 
   // Input
   scoped_ptr<ServiceWorkerFetchRequest> request;
   ServiceWorkerCache::ResponseCallback original_callback;
   base::WeakPtr<storage::BlobStorageContext> blob_storage_context;
   disk_cache::Entry* entry;
 
   // Output
   scoped_ptr<ServiceWorkerResponse> response;
-  scoped_refptr<storage::BlobData> blob_data;
+  scoped_ptr<storage::BlobDataBuilder> blob_data;
 
   // For reading the cache entry data into a blob.
   scoped_refptr<net::IOBufferWithSize> response_body_buffer;
   size_t total_bytes_read;
 
   DISALLOW_COPY_AND_ASSIGN(MatchContext);
 };
 
 // The state needed to pass between ServiceWorkerCache::Put callbacks.
 struct ServiceWorkerCache::PutContext {
@@ skipping 371 matching lines @@
   // Stream the response body into a blob.
   if (!match_context->blob_storage_context) {
     match_context->original_callback.Run(ServiceWorkerCache::ErrorTypeStorage,
                                          scoped_ptr<ServiceWorkerResponse>(),
                                          scoped_ptr<storage::BlobDataHandle>());
     return;
   }
 
   response->blob_uuid = base::GenerateGUID();
 
-  match_context->blob_data = new storage::BlobData(response->blob_uuid);
+  match_context->blob_data.reset(
+      new storage::BlobDataBuilder(response->blob_uuid));
   match_context->response_body_buffer = new net::IOBufferWithSize(kBufferSize);
 
   disk_cache::Entry* tmp_entry_ptr = match_context->entry;
   net::IOBufferWithSize* response_body_buffer =
       match_context->response_body_buffer.get();
 
   net::CompletionCallback read_callback = base::Bind(
       &ServiceWorkerCache::MatchDidReadResponseBodyData,
       weak_ptr_factory_.GetWeakPtr(), base::Passed(match_context.Pass()));
 
@@ skipping 54 matching lines @@
     scoped_ptr<MatchContext> match_context) {
   if (!match_context->blob_storage_context) {
     match_context->original_callback.Run(ServiceWorkerCache::ErrorTypeStorage,
                                          scoped_ptr<ServiceWorkerResponse>(),
                                          scoped_ptr<storage::BlobDataHandle>());
     return;
   }
 
   scoped_ptr<storage::BlobDataHandle> blob_data_handle(
       match_context->blob_storage_context->AddFinishedBlob(
-          match_context->blob_data.get()));
+          *match_context->blob_data.get()));
 
   match_context->original_callback.Run(ServiceWorkerCache::ErrorTypeOK,
                                        match_context->response.Pass(),
                                        blob_data_handle.Pass());
 }
 
 void ServiceWorkerCache::PutImpl(scoped_ptr<PutContext> put_context) {
   if (backend_state_ != BACKEND_OPEN) {
     put_context->callback.Run(ErrorTypeStorage,
                               scoped_ptr<ServiceWorkerResponse>(),
@@ skipping 391 matching lines @@
 
 void ServiceWorkerCache::PendingRequestsCallback(
     const RequestsCallback& callback,
     ErrorType error,
     scoped_ptr<Requests> requests) {
   callback.Run(error, requests.Pass());
   DecPendingOps();
 }
 
 }  // namespace content