| Index: content/browser/fileapi/chrome_blob_storage_context.cc
|
| diff --git a/content/browser/fileapi/chrome_blob_storage_context.cc b/content/browser/fileapi/chrome_blob_storage_context.cc
|
| index fce0bed906621b099fcd5aa647f9c4dd3a6b294a..a133c46aea3da6263641f4c94aacd9e727c0a1f0 100644
|
| --- a/content/browser/fileapi/chrome_blob_storage_context.cc
|
| +++ b/content/browser/fileapi/chrome_blob_storage_context.cc
|
| @@ -9,11 +9,11 @@
|
| #include "content/public/browser/blob_handle.h"
|
| #include "content/public/browser/browser_context.h"
|
| #include "content/public/browser/browser_thread.h"
|
| -#include "webkit/browser/blob/blob_data_handle.h"
|
| -#include "webkit/browser/blob/blob_storage_context.h"
|
| +#include "storage/browser/blob/blob_data_handle.h"
|
| +#include "storage/browser/blob/blob_storage_context.h"
|
|
|
| using base::UserDataAdapter;
|
| -using webkit_blob::BlobStorageContext;
|
| +using storage::BlobStorageContext;
|
|
|
| namespace content {
|
|
|
| @@ -21,9 +21,8 @@ namespace {
|
|
|
| class BlobHandleImpl : public BlobHandle {
|
| public:
|
| - BlobHandleImpl(scoped_ptr<webkit_blob::BlobDataHandle> handle)
|
| - : handle_(handle.Pass()) {
|
| - }
|
| + BlobHandleImpl(scoped_ptr<storage::BlobDataHandle> handle)
|
| + : handle_(handle.Pass()) {}
|
|
|
| virtual ~BlobHandleImpl() {}
|
|
|
| @@ -32,7 +31,7 @@ class BlobHandleImpl : public BlobHandle {
|
| }
|
|
|
| private:
|
| - scoped_ptr<webkit_blob::BlobDataHandle> handle_;
|
| + scoped_ptr<storage::BlobDataHandle> handle_;
|
| };
|
|
|
| } // namespace
|
| @@ -71,11 +70,10 @@ scoped_ptr<BlobHandle> ChromeBlobStorageContext::CreateMemoryBackedBlob(
|
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
|
|
|
| std::string 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->AppendData(data, length);
|
|
|
| - scoped_ptr<webkit_blob::BlobDataHandle> blob_data_handle =
|
| + scoped_ptr<storage::BlobDataHandle> blob_data_handle =
|
| context_->AddFinishedBlob(blob_data.get());
|
| if (!blob_data_handle)
|
| return scoped_ptr<BlobHandle>();
|
|
|