[Storage] Blob Storage Refactoring pt 1

content/browser/media/android/media_resource_getter_impl.cc

 // Copyright 2013 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/media/android/media_resource_getter_impl.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/bind.h"
 #include "base/path_service.h"
@@ skipping 11 matching lines @@
 #include "media/base/android/media_url_interceptor.h"
 #include "net/base/auth.h"
 #include "net/cookies/cookie_monster.h"
 #include "net/cookies/cookie_store.h"
 #include "net/http/http_auth.h"
 #include "net/http/http_transaction_factory.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "storage/browser/blob/blob_data_handle.h"
 #include "storage/browser/blob/blob_storage_context.h"
+#include "storage/common/blob/blob_data.h"
 #include "url/gurl.h"
 
 using base::android::ConvertUTF8ToJavaString;
 using base::android::ScopedJavaLocalRef;
 
 namespace content {
 
 static void ReturnResultOnUIThread(
     const base::Callback<void(const std::string&)>& callback,
     const std::string& result) {
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE, base::Bind(callback, result));
 }
 
 static void RequestPlatformPathFromBlobURL(
     const GURL& url,
     ResourceContext* resource_context,
     const base::Callback<void(const std::string&)>& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   ChromeBlobStorageContext* blob_storage_context =
       GetChromeBlobStorageContextForResourceContext(resource_context);
 
-  scoped_ptr<storage::BlobDataHandle> handle =
+  scoped_ptr<storage::BlobDataSnapshotHandle> handle =
       blob_storage_context->context()->GetBlobDataFromPublicURL(url);
   if (!handle) {
     // There are plenty of cases where handle can be empty. The most trivial is
     // when JS has aready revoked the given blob URL via URL.revokeObjectURL
     ReturnResultOnUIThread(callback, std::string());
     return;
   }
-  storage::BlobData* data = handle->data();
+  const storage::BlobDataSnapshot* data = handle->data();
   if (!data) {
     ReturnResultOnUIThread(callback, std::string());
     NOTREACHED();
     return;
   }
-  const std::vector<storage::BlobData::Item> items = data->items();
+  const std::vector<scoped_refptr<storage::BlobDataItem>>& items =
+      data->items();
 
   // TODO(qinmin): handle the case when the blob data is not a single file.
   DLOG_IF(WARNING, items.size() != 1u)
       << "More than one blob data are present: " << items.size();
-  ReturnResultOnUIThread(callback, items[0].path().value());
+  ReturnResultOnUIThread(callback, items[0]->path().value());
 }
 
 static void RequestPlaformPathFromFileSystemURL(
     const GURL& url,
     int render_process_id,
     scoped_refptr<storage::FileSystemContext> file_system_context,
     const base::Callback<void(const std::string&)>& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   base::FilePath platform_path;
   SyncGetPlatformPath(file_system_context.get(),
@@ skipping 291 matching lines @@
       FROM_HERE,
       base::Bind(&GetMediaMetadataFromFd, fd, offset, size, callback));
 }
 
 // static
 bool MediaResourceGetterImpl::RegisterMediaResourceGetter(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace content