Collapse fileapi, webkit_blob, webkit_database, quota, and webkit_common namespaces into single sto…

webkit/browser/blob/file_stream_reader.h

Index: webkit/browser/blob/file_stream_reader.h
diff --git a/webkit/browser/blob/file_stream_reader.h b/webkit/browser/blob/file_stream_reader.h
index 832c5d5dc668b7b21bfba5939d0718bd3631822c..faf836313c0733298e9fa1c859cda17c2c17493c 100644
--- a/webkit/browser/blob/file_stream_reader.h
+++ b/webkit/browser/blob/file_stream_reader.h
@@ -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 {
@@ -52,8 +52,8 @@ class FileStreamReader {
   // 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,
+      CreateForFileSystemFile(storage::FileSystemContext* context,
+                              const storage::FileSystemURL& url,
                               int64 initial_offset,
                               const base::Time& expected_modification_time);
 
@@ -94,6 +94,6 @@ class FileStreamReader {
   virtual int64 GetLength(const net::Int64CompletionCallback& callback) = 0;
 };
 
-}  // namespace webkit_blob
+}  // namespace storage
 
 #endif  // WEBKIT_BLOB_FILE_STREAM_READER_H_