| Index: content/public/test/mock_blob_url_request_context.h
|
| diff --git a/content/public/test/mock_blob_url_request_context.h b/content/public/test/mock_blob_url_request_context.h
|
| index 8e2201ee5c7e20189ed6ac9230601462d56ba119..0a2177228fa564d8d029ddeec0eaeb8fe837449d 100644
|
| --- a/content/public/test/mock_blob_url_request_context.h
|
| +++ b/content/public/test/mock_blob_url_request_context.h
|
| @@ -9,11 +9,11 @@
|
| #include "net/url_request/url_request_job.h"
|
| #include "net/url_request/url_request_job_factory_impl.h"
|
|
|
| -namespace fileapi {
|
| +namespace storage {
|
| class FileSystemContext;
|
| }
|
|
|
| -namespace webkit_blob {
|
| +namespace storage {
|
| class BlobDataHandle;
|
| class BlobStorageContext;
|
| }
|
| @@ -22,16 +22,16 @@ namespace content {
|
|
|
| class MockBlobURLRequestContext : public net::URLRequestContext {
|
| public:
|
| - MockBlobURLRequestContext(fileapi::FileSystemContext* file_system_context);
|
| + MockBlobURLRequestContext(storage::FileSystemContext* file_system_context);
|
| virtual ~MockBlobURLRequestContext();
|
|
|
| - webkit_blob::BlobStorageContext* blob_storage_context() const {
|
| + storage::BlobStorageContext* blob_storage_context() const {
|
| return blob_storage_context_.get();
|
| }
|
|
|
| private:
|
| net::URLRequestJobFactoryImpl job_factory_;
|
| - scoped_ptr<webkit_blob::BlobStorageContext> blob_storage_context_;
|
| + scoped_ptr<storage::BlobStorageContext> blob_storage_context_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(MockBlobURLRequestContext);
|
| };
|
| @@ -45,12 +45,12 @@ class ScopedTextBlob {
|
| ~ScopedTextBlob();
|
|
|
| // Returns a BlobDataHandle referring to the scoped blob.
|
| - scoped_ptr<webkit_blob::BlobDataHandle> GetBlobDataHandle();
|
| + scoped_ptr<storage::BlobDataHandle> GetBlobDataHandle();
|
|
|
| private:
|
| const std::string blob_id_;
|
| - webkit_blob::BlobStorageContext* context_;
|
| - scoped_ptr<webkit_blob::BlobDataHandle> handle_;
|
| + storage::BlobStorageContext* context_;
|
| + scoped_ptr<storage::BlobDataHandle> handle_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ScopedTextBlob);
|
| };
|
|
|