Index: content/public/test/mock_blob_url_request_context.cc |
diff --git a/content/public/test/mock_blob_url_request_context.cc b/content/public/test/mock_blob_url_request_context.cc |
index 7d7ea1280d698305f77386b77b6a8b3fd3bf6818..3e5f9d492d46bca00dff5c61ec2df855f56e8926 100644 |
--- a/content/public/test/mock_blob_url_request_context.cc |
+++ b/content/public/test/mock_blob_url_request_context.cc |
@@ -4,22 +4,22 @@ |
#include "content/public/test/mock_blob_url_request_context.h" |
-#include "webkit/browser/blob/blob_storage_context.h" |
-#include "webkit/browser/blob/blob_url_request_job.h" |
-#include "webkit/browser/blob/blob_url_request_job_factory.h" |
-#include "webkit/common/blob/blob_data.h" |
- |
+#include "storage/browser/blob/blob_storage_context.h" |
+#include "storage/browser/blob/blob_url_request_job.h" |
+#include "storage/browser/blob/blob_url_request_job_factory.h" |
+#include "storage/common/blob/blob_data.h" |
namespace content { |
MockBlobURLRequestContext::MockBlobURLRequestContext( |
- fileapi::FileSystemContext* file_system_context) |
- : blob_storage_context_(new webkit_blob::BlobStorageContext) { |
+ storage::FileSystemContext* file_system_context) |
+ : blob_storage_context_(new storage::BlobStorageContext) { |
// Job factory owns the protocol handler. |
job_factory_.SetProtocolHandler( |
- "blob", new webkit_blob::BlobProtocolHandler(blob_storage_context_.get(), |
- file_system_context, |
- base::MessageLoopProxy::current())); |
+ "blob", |
+ new storage::BlobProtocolHandler(blob_storage_context_.get(), |
+ file_system_context, |
+ base::MessageLoopProxy::current())); |
set_job_factory(&job_factory_); |
} |
@@ -34,8 +34,7 @@ ScopedTextBlob::ScopedTextBlob( |
: blob_id_(blob_id), |
context_(request_context.blob_storage_context()) { |
DCHECK(context_); |
- scoped_refptr<webkit_blob::BlobData> blob_data( |
- new webkit_blob::BlobData(blob_id_)); |
+ scoped_refptr<storage::BlobData> blob_data(new storage::BlobData(blob_id_)); |
if (!data.empty()) |
blob_data->AppendData(data); |
handle_ = context_->AddFinishedBlob(blob_data); |
@@ -44,7 +43,7 @@ ScopedTextBlob::ScopedTextBlob( |
ScopedTextBlob::~ScopedTextBlob() { |
} |
-scoped_ptr<webkit_blob::BlobDataHandle> ScopedTextBlob::GetBlobDataHandle() { |
+scoped_ptr<storage::BlobDataHandle> ScopedTextBlob::GetBlobDataHandle() { |
return context_->GetBlobDataFromUUID(blob_id_); |
} |