| Index: storage/browser/blob/blob_url_request_job.h
|
| diff --git a/webkit/browser/blob/blob_url_request_job.h b/storage/browser/blob/blob_url_request_job.h
|
| similarity index 90%
|
| rename from webkit/browser/blob/blob_url_request_job.h
|
| rename to storage/browser/blob/blob_url_request_job.h
|
| index 81a5a3e6ee9453542f2f46fbd90fdeab83fb5c5b..ebae595fddc6e716d88851b07527d891aa455880 100644
|
| --- a/webkit/browser/blob/blob_url_request_job.h
|
| +++ b/storage/browser/blob/blob_url_request_job.h
|
| @@ -12,14 +12,14 @@
|
| #include "net/http/http_byte_range.h"
|
| #include "net/http/http_status_code.h"
|
| #include "net/url_request/url_request_job.h"
|
| -#include "webkit/browser/webkit_storage_browser_export.h"
|
| -#include "webkit/common/blob/blob_data.h"
|
| +#include "storage/common/storage_export.h"
|
| +#include "storage/common/blob/blob_data.h"
|
|
|
| namespace base {
|
| class MessageLoopProxy;
|
| }
|
|
|
| -namespace fileapi {
|
| +namespace storage {
|
| class FileSystemContext;
|
| }
|
|
|
| @@ -28,18 +28,17 @@ class DrainableIOBuffer;
|
| class IOBuffer;
|
| }
|
|
|
| -namespace webkit_blob {
|
| +namespace storage {
|
|
|
| class FileStreamReader;
|
|
|
| // A request job that handles reading blob URLs.
|
| -class WEBKIT_STORAGE_BROWSER_EXPORT BlobURLRequestJob
|
| - : public net::URLRequestJob {
|
| +class STORAGE_EXPORT BlobURLRequestJob : public net::URLRequestJob {
|
| public:
|
| BlobURLRequestJob(net::URLRequest* request,
|
| net::NetworkDelegate* network_delegate,
|
| BlobData* blob_data,
|
| - fileapi::FileSystemContext* file_system_context,
|
| + storage::FileSystemContext* file_system_context,
|
| base::MessageLoopProxy* resolving_message_loop_proxy);
|
|
|
| // net::URLRequestJob methods.
|
| @@ -98,7 +97,7 @@ class WEBKIT_STORAGE_BROWSER_EXPORT BlobURLRequestJob
|
| scoped_refptr<BlobData> blob_data_;
|
|
|
| // Variables for controlling read from |blob_data_|.
|
| - scoped_refptr<fileapi::FileSystemContext> file_system_context_;
|
| + scoped_refptr<storage::FileSystemContext> file_system_context_;
|
| scoped_refptr<base::MessageLoopProxy> file_thread_proxy_;
|
| std::vector<int64> item_length_list_;
|
| int64 total_size_;
|
| @@ -124,6 +123,6 @@ class WEBKIT_STORAGE_BROWSER_EXPORT BlobURLRequestJob
|
| DISALLOW_COPY_AND_ASSIGN(BlobURLRequestJob);
|
| };
|
|
|
| -} // namespace webkit_blob
|
| +} // namespace storage
|
|
|
| #endif // WEBKIT_BROWSER_BLOB_BLOB_URL_REQUEST_JOB_H_
|
|
|