Index: storage/browser/fileapi/file_system_file_stream_reader.h |
diff --git a/webkit/browser/fileapi/file_system_file_stream_reader.h b/storage/browser/fileapi/file_system_file_stream_reader.h |
similarity index 75% |
rename from webkit/browser/fileapi/file_system_file_stream_reader.h |
rename to storage/browser/fileapi/file_system_file_stream_reader.h |
index 361502237ebfbefef61aae0ce643988dfc2cc0a4..9a7c458c0e8984e5f529a885d66938fcb82b992a 100644 |
--- a/webkit/browser/fileapi/file_system_file_stream_reader.h |
+++ b/storage/browser/fileapi/file_system_file_stream_reader.h |
@@ -9,10 +9,10 @@ |
#include "base/files/file.h" |
#include "base/memory/ref_counted.h" |
#include "base/time/time.h" |
-#include "webkit/browser/blob/file_stream_reader.h" |
-#include "webkit/browser/fileapi/file_system_url.h" |
-#include "webkit/browser/webkit_storage_browser_export.h" |
-#include "webkit/common/blob/shareable_file_reference.h" |
+#include "storage/browser/blob/file_stream_reader.h" |
+#include "storage/browser/fileapi/file_system_url.h" |
+#include "storage/common/storage_export.h" |
+#include "storage/common/blob/shareable_file_reference.h" |
namespace base { |
class FilePath; |
@@ -23,7 +23,7 @@ namespace content { |
class FileSystemFileStreamReaderTest; |
} |
-namespace fileapi { |
+namespace storage { |
class FileSystemContext; |
@@ -32,19 +32,20 @@ class FileSystemContext; |
// remote filesystem should implement its own reader rather than relying |
// on FileSystemOperation::GetSnapshotFile() which may force downloading |
// the entire contents for remote files. |
-class WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE FileSystemFileStreamReader |
- : public NON_EXPORTED_BASE(webkit_blob::FileStreamReader) { |
+class STORAGE_EXPORT_PRIVATE FileSystemFileStreamReader |
+ : public NON_EXPORTED_BASE(storage::FileStreamReader) { |
public: |
virtual ~FileSystemFileStreamReader(); |
// FileStreamReader overrides. |
- virtual int Read(net::IOBuffer* buf, int buf_len, |
+ virtual int Read(net::IOBuffer* buf, |
+ int buf_len, |
const net::CompletionCallback& callback) OVERRIDE; |
virtual int64 GetLength( |
const net::Int64CompletionCallback& callback) OVERRIDE; |
private: |
- friend class webkit_blob::FileStreamReader; |
+ friend class storage::FileStreamReader; |
friend class content::FileSystemFileStreamReaderTest; |
FileSystemFileStreamReader(FileSystemContext* file_system_context, |
@@ -60,20 +61,20 @@ class WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE FileSystemFileStreamReader |
base::File::Error file_error, |
const base::File::Info& file_info, |
const base::FilePath& platform_path, |
- const scoped_refptr<webkit_blob::ShareableFileReference>& file_ref); |
+ const scoped_refptr<storage::ShareableFileReference>& file_ref); |
scoped_refptr<FileSystemContext> file_system_context_; |
FileSystemURL url_; |
const int64 initial_offset_; |
const base::Time expected_modification_time_; |
- scoped_ptr<webkit_blob::FileStreamReader> local_file_reader_; |
- scoped_refptr<webkit_blob::ShareableFileReference> snapshot_ref_; |
+ scoped_ptr<storage::FileStreamReader> local_file_reader_; |
+ scoped_refptr<storage::ShareableFileReference> snapshot_ref_; |
bool has_pending_create_snapshot_; |
base::WeakPtrFactory<FileSystemFileStreamReader> weak_factory_; |
DISALLOW_COPY_AND_ASSIGN(FileSystemFileStreamReader); |
}; |
-} // namespace fileapi |
+} // namespace storage |
#endif // WEBKIT_BROWSER_FILEAPI_FILE_SYSTEM_FILE_STREAM_READER_H_ |