| Index: storage/browser/blob/blob_url_request_job_factory.h
|
| diff --git a/webkit/browser/blob/blob_url_request_job_factory.h b/storage/browser/blob/blob_url_request_job_factory.h
|
| similarity index 81%
|
| rename from webkit/browser/blob/blob_url_request_job_factory.h
|
| rename to storage/browser/blob/blob_url_request_job_factory.h
|
| index 954aaeebae6df5c578e6051ceb95c843dec035e3..c16966cd2b25ec1fe3697bfb13d207a7ea045aac 100644
|
| --- a/webkit/browser/blob/blob_url_request_job_factory.h
|
| +++ b/storage/browser/blob/blob_url_request_job_factory.h
|
| @@ -10,27 +10,27 @@
|
| #include "base/memory/scoped_ptr.h"
|
| #include "net/url_request/url_request.h"
|
| #include "net/url_request/url_request_job_factory.h"
|
| -#include "webkit/browser/webkit_storage_browser_export.h"
|
| +#include "storage/common/storage_export.h"
|
|
|
| namespace base {
|
| class MessageLoopProxy;
|
| } // namespace base
|
|
|
| -namespace fileapi {
|
| +namespace storage {
|
| class FileSystemContext;
|
| -} // namespace fileapi
|
| +} // namespace storage
|
|
|
| namespace net {
|
| class URLRequestContext;
|
| } // namespace net
|
|
|
| -namespace webkit_blob {
|
| +namespace storage {
|
|
|
| class BlobData;
|
| class BlobDataHandle;
|
| class BlobStorageContext;
|
|
|
| -class WEBKIT_STORAGE_BROWSER_EXPORT BlobProtocolHandler
|
| +class STORAGE_EXPORT BlobProtocolHandler
|
| : public net::URLRequestJobFactory::ProtocolHandler {
|
| public:
|
| // A helper to manufacture an URLRequest to retrieve the given blob.
|
| @@ -46,7 +46,7 @@ class WEBKIT_STORAGE_BROWSER_EXPORT BlobProtocolHandler
|
| scoped_ptr<BlobDataHandle> blob_data_handle);
|
|
|
| BlobProtocolHandler(BlobStorageContext* context,
|
| - fileapi::FileSystemContext* file_system_context,
|
| + storage::FileSystemContext* file_system_context,
|
| base::MessageLoopProxy* file_loop_proxy);
|
| virtual ~BlobProtocolHandler();
|
|
|
| @@ -55,16 +55,15 @@ class WEBKIT_STORAGE_BROWSER_EXPORT BlobProtocolHandler
|
| net::NetworkDelegate* network_delegate) const OVERRIDE;
|
|
|
| private:
|
| - scoped_refptr<BlobData> LookupBlobData(
|
| - net::URLRequest* request) const;
|
| + scoped_refptr<BlobData> LookupBlobData(net::URLRequest* request) const;
|
|
|
| base::WeakPtr<BlobStorageContext> context_;
|
| - const scoped_refptr<fileapi::FileSystemContext> file_system_context_;
|
| + const scoped_refptr<storage::FileSystemContext> file_system_context_;
|
| const scoped_refptr<base::MessageLoopProxy> file_loop_proxy_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(BlobProtocolHandler);
|
| };
|
|
|
| -} // namespace webkit_blob
|
| +} // namespace storage
|
|
|
| #endif // WEBKIT_BROWSER_BLOB_BLOB_URL_REQUEST_JOB_FACTORY_H_
|
|
|