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

chrome/browser/media_galleries/fileapi/mtp_file_stream_reader.h

Index: chrome/browser/media_galleries/fileapi/mtp_file_stream_reader.h
diff --git a/chrome/browser/media_galleries/fileapi/mtp_file_stream_reader.h b/chrome/browser/media_galleries/fileapi/mtp_file_stream_reader.h
index 1b097178c9def13282777495f85ac1953891e722..ae2b14b2f7c3761031c58b8090284800f8ab8055 100644
--- a/chrome/browser/media_galleries/fileapi/mtp_file_stream_reader.h
+++ b/chrome/browser/media_galleries/fileapi/mtp_file_stream_reader.h
@@ -17,15 +17,15 @@ namespace base {
 class FilePath;
 }
 
-namespace fileapi {
+namespace storage {
 class FileSystemContext;
 }
 
 class MTPFileStreamReader
-    : public NON_EXPORTED_BASE(webkit_blob::FileStreamReader) {
+    : public NON_EXPORTED_BASE(storage::FileStreamReader) {
  public:
-  MTPFileStreamReader(fileapi::FileSystemContext* file_system_context,
-                      const fileapi::FileSystemURL& url,
+  MTPFileStreamReader(storage::FileSystemContext* file_system_context,
+                      const storage::FileSystemURL& url,
                       int64 initial_offset,
                       const base::Time& expected_modification_time,
                       bool do_media_header_validation);
@@ -52,8 +52,8 @@ class MTPFileStreamReader
   void FinishGetLength(const net::Int64CompletionCallback& callback,
                        const base::File::Info& file_info);
 
-  scoped_refptr<fileapi::FileSystemContext> file_system_context_;
-  fileapi::FileSystemURL url_;
+  scoped_refptr<storage::FileSystemContext> file_system_context_;
+  storage::FileSystemURL url_;
   int64 current_offset_;
   const base::Time expected_modification_time_;