Move storage-related files from webkit/ to new top-level directory storage/

storage/browser/blob/file_stream_reader.h

Index: storage/browser/blob/file_stream_reader.h
diff --git a/webkit/browser/blob/file_stream_reader.h b/storage/browser/blob/file_stream_reader.h
similarity index 79%
rename from webkit/browser/blob/file_stream_reader.h
rename to storage/browser/blob/file_stream_reader.h
index 832c5d5dc668b7b21bfba5939d0718bd3631822c..078f77b6d45e2682773e6f13144d6ff62cb05934 100644
--- a/webkit/browser/blob/file_stream_reader.h
+++ b/storage/browser/blob/file_stream_reader.h
@@ -9,7 +9,7 @@
 #include "base/compiler_specific.h"
 #include "base/files/file.h"
 #include "net/base/completion_callback.h"
-#include "webkit/browser/webkit_storage_browser_export.h"
+#include "storage/common/storage_export.h"
 
 namespace base {
 class FilePath;
@@ -21,12 +21,12 @@ namespace net {
 class IOBuffer;
 }
 
-namespace fileapi {
+namespace storage {
 class FileSystemContext;
 class FileSystemURL;
 }
 
-namespace webkit_blob {
+namespace storage {
 
 // A generic interface for reading a file-like object.
 class FileStreamReader {
@@ -40,25 +40,25 @@ class FileStreamReader {
   // actual modification time to see if the file has been modified, and if
   // it does any succeeding read operations should fail with
   // ERR_UPLOAD_FILE_CHANGED error.
-  WEBKIT_STORAGE_BROWSER_EXPORT static FileStreamReader*
-      CreateForLocalFile(base::TaskRunner* task_runner,
-                         const base::FilePath& file_path,
-                         int64 initial_offset,
-                         const base::Time& expected_modification_time);
+  STORAGE_EXPORT static FileStreamReader* CreateForLocalFile(
+      base::TaskRunner* task_runner,
+      const base::FilePath& file_path,
+      int64 initial_offset,
+      const base::Time& expected_modification_time);
 
   // Creates a new reader for a filesystem URL |url| form |initial_offset|.
   // |expected_modification_time| specifies the expected last modification if
   // the value is non-null, the reader will check the underlying file's actual
   // modification time to see if the file has been modified, and if it does any
   // succeeding read operations should fail with ERR_UPLOAD_FILE_CHANGED error.
-  WEBKIT_STORAGE_BROWSER_EXPORT static FileStreamReader*
-      CreateForFileSystemFile(fileapi::FileSystemContext* context,
-                              const fileapi::FileSystemURL& url,
-                              int64 initial_offset,
-                              const base::Time& expected_modification_time);
+  STORAGE_EXPORT static FileStreamReader* CreateForFileSystemFile(
+      storage::FileSystemContext* context,
+      const storage::FileSystemURL& url,
+      int64 initial_offset,
+      const base::Time& expected_modification_time);
 
   // Verify if the underlying file has not been modified.
-  WEBKIT_STORAGE_BROWSER_EXPORT static bool VerifySnapshotTime(
+  STORAGE_EXPORT static bool VerifySnapshotTime(
       const base::Time& expected_modification_time,
       const base::File::Info& file_info);
 
@@ -79,7 +79,8 @@ class FileStreamReader {
   //
   // If the stream is deleted while it has an in-flight Read operation
   // |callback| will not be called.
-  virtual int Read(net::IOBuffer* buf, int buf_len,
+  virtual int Read(net::IOBuffer* buf,
+                   int buf_len,
                    const net::CompletionCallback& callback) = 0;
 
   // Returns the length of the file if it could successfully retrieve the
@@ -94,6 +95,6 @@ class FileStreamReader {
   virtual int64 GetLength(const net::Int64CompletionCallback& callback) = 0;
 };
 
-}  // namespace webkit_blob
+}  // namespace storage
 
 #endif  // WEBKIT_BLOB_FILE_STREAM_READER_H_