Index: content/browser/indexed_db/indexed_db_callbacks.cc |
diff --git a/content/browser/indexed_db/indexed_db_callbacks.cc b/content/browser/indexed_db/indexed_db_callbacks.cc |
index cee89b1fb75b9875062a21a3646913e424f57b2a..75b0e3fccdc281e69b99a140b188b762b26c1ec5 100644 |
--- a/content/browser/indexed_db/indexed_db_callbacks.cc |
+++ b/content/browser/indexed_db/indexed_db_callbacks.cc |
@@ -21,12 +21,12 @@ |
#include "content/browser/indexed_db/indexed_db_value.h" |
#include "content/common/indexed_db/indexed_db_constants.h" |
#include "content/common/indexed_db/indexed_db_messages.h" |
-#include "webkit/browser/blob/blob_storage_context.h" |
-#include "webkit/browser/quota/quota_manager.h" |
-#include "webkit/common/blob/blob_data.h" |
-#include "webkit/common/blob/shareable_file_reference.h" |
+#include "storage/browser/blob/blob_storage_context.h" |
+#include "storage/browser/quota/quota_manager.h" |
+#include "storage/common/blob/blob_data.h" |
+#include "storage/common/blob/shareable_file_reference.h" |
-using webkit_blob::ShareableFileReference; |
+using storage::ShareableFileReference; |
namespace content { |
@@ -194,12 +194,12 @@ void IndexedDBCallbacks::OnSuccess(scoped_ptr<IndexedDBConnection> connection, |
static std::string CreateBlobData( |
const IndexedDBBlobInfo& blob_info, |
scoped_refptr<IndexedDBDispatcherHost> dispatcher_host, |
- webkit_blob::BlobStorageContext* blob_storage_context, |
+ storage::BlobStorageContext* blob_storage_context, |
base::TaskRunner* task_runner) { |
std::string uuid = blob_info.uuid(); |
if (!uuid.empty()) { |
// We're sending back a live blob, not a reference into our backing store. |
- scoped_ptr<webkit_blob::BlobDataHandle> blob_data_handle( |
+ scoped_ptr<storage::BlobDataHandle> blob_data_handle( |
blob_storage_context->GetBlobDataFromUUID(uuid)); |
dispatcher_host->HoldBlobDataHandle(uuid, blob_data_handle.Pass()); |
return uuid; |
@@ -216,11 +216,10 @@ static std::string CreateBlobData( |
} |
uuid = base::GenerateGUID(); |
- scoped_refptr<webkit_blob::BlobData> blob_data = |
- new webkit_blob::BlobData(uuid); |
+ scoped_refptr<storage::BlobData> blob_data = new storage::BlobData(uuid); |
blob_data->AppendFile( |
blob_info.file_path(), 0, blob_info.size(), blob_info.last_modified()); |
- scoped_ptr<webkit_blob::BlobDataHandle> blob_data_handle( |
+ scoped_ptr<storage::BlobDataHandle> blob_data_handle( |
blob_storage_context->AddFinishedBlob(blob_data.get())); |
dispatcher_host->HoldBlobDataHandle(uuid, blob_data_handle.Pass()); |