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

content/browser/fileapi/upload_file_system_file_element_reader.h

Index: content/browser/fileapi/upload_file_system_file_element_reader.h
diff --git a/content/browser/fileapi/upload_file_system_file_element_reader.h b/content/browser/fileapi/upload_file_system_file_element_reader.h
index 1b33489d1b2cfca1153d4cdcb2c0f339e3725f09..8c0becdc0c471c71921cbf138f3f57a71c14e5dc 100644
--- a/content/browser/fileapi/upload_file_system_file_element_reader.h
+++ b/content/browser/fileapi/upload_file_system_file_element_reader.h
@@ -11,11 +11,11 @@
 #include "net/base/upload_element_reader.h"
 #include "url/gurl.h"
 
-namespace webkit_blob {
+namespace storage {
 class FileStreamReader;
 }
 
-namespace fileapi {
+namespace storage {
 class FileSystemContext;
 }
 
@@ -26,7 +26,7 @@ class CONTENT_EXPORT UploadFileSystemFileElementReader :
     NON_EXPORTED_BASE(public net::UploadElementReader) {
  public:
   UploadFileSystemFileElementReader(
-      fileapi::FileSystemContext* file_system_context,
+      storage::FileSystemContext* file_system_context,
       const GURL& url,
       uint64 range_offset,
       uint64 range_length,
@@ -45,13 +45,13 @@ class CONTENT_EXPORT UploadFileSystemFileElementReader :
   void OnGetLength(const net::CompletionCallback& callback, int64 result);
   void OnRead(const net::CompletionCallback& callback, int result);
 
-  scoped_refptr<fileapi::FileSystemContext> file_system_context_;
+  scoped_refptr<storage::FileSystemContext> file_system_context_;
   const GURL url_;
   const uint64 range_offset_;
   const uint64 range_length_;
   const base::Time expected_modification_time_;
 
-  scoped_ptr<webkit_blob::FileStreamReader> stream_reader_;
+  scoped_ptr<storage::FileStreamReader> stream_reader_;
 
   uint64 stream_length_;
   uint64 position_;