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

webkit/browser/fileapi/file_system_file_stream_reader.h

Index: webkit/browser/fileapi/file_system_file_stream_reader.h
diff --git a/webkit/browser/fileapi/file_system_file_stream_reader.h b/webkit/browser/fileapi/file_system_file_stream_reader.h
index 361502237ebfbefef61aae0ce643988dfc2cc0a4..4661b9edddf77f8c1a696139a494467654b376f1 100644
--- a/webkit/browser/fileapi/file_system_file_stream_reader.h
+++ b/webkit/browser/fileapi/file_system_file_stream_reader.h
@@ -23,7 +23,7 @@ namespace content {
 class FileSystemFileStreamReaderTest;
 }
 
-namespace fileapi {
+namespace storage {
 
 class FileSystemContext;
 
@@ -33,7 +33,7 @@ class FileSystemContext;
 // 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) {
+    : public NON_EXPORTED_BASE(storage::FileStreamReader) {
  public:
   virtual ~FileSystemFileStreamReader();
 
@@ -44,7 +44,7 @@ class WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE FileSystemFileStreamReader
       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 +60,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_