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

webkit/browser/fileapi/file_system_context.h

Index: webkit/browser/fileapi/file_system_context.h
diff --git a/webkit/browser/fileapi/file_system_context.h b/webkit/browser/fileapi/file_system_context.h
index 428ef601149e660da3b49cdb710d5704a26609ed..bcae2ff138182687ec4cad00fb511f9f7ee12544 100644
--- a/webkit/browser/fileapi/file_system_context.h
+++ b/webkit/browser/fileapi/file_system_context.h
@@ -33,7 +33,7 @@ namespace chrome {
 class NativeMediaFileUtilTest;
 }
 
-namespace quota {
+namespace storage {
 class QuotaManagerProxy;
 class SpecialStoragePolicy;
 }
@@ -42,12 +42,12 @@ namespace net {
 class URLRequest;
 }
 
-namespace webkit_blob {
+namespace storage {
 class BlobURLRequestJobTest;
 class FileStreamReader;
 }
 
-namespace fileapi {
+namespace storage {
 
 class AsyncFileUtil;
 class CopyOrMoveFileValidatorFactory;
@@ -119,8 +119,8 @@ class WEBKIT_STORAGE_BROWSER_EXPORT FileSystemContext
       base::SingleThreadTaskRunner* io_task_runner,
       base::SequencedTaskRunner* file_task_runner,
       ExternalMountPoints* external_mount_points,
-      quota::SpecialStoragePolicy* special_storage_policy,
-      quota::QuotaManagerProxy* quota_manager_proxy,
+      storage::SpecialStoragePolicy* special_storage_policy,
+      storage::QuotaManagerProxy* quota_manager_proxy,
       ScopedVector<FileSystemBackend> additional_backends,
       const std::vector<URLRequestAutoMountHandler>& auto_mount_handlers,
       const base::FilePath& partition_path,
@@ -136,7 +136,7 @@ class WEBKIT_STORAGE_BROWSER_EXPORT FileSystemContext
       const GURL& origin_url,
       FileSystemType type);
 
-  quota::QuotaManagerProxy* quota_manager_proxy() const {
+  storage::QuotaManagerProxy* quota_manager_proxy() const {
     return quota_manager_proxy_.get();
   }
 
@@ -246,7 +246,7 @@ class WEBKIT_STORAGE_BROWSER_EXPORT FileSystemContext
   // FileSystemBackend for the URL and call the backend's CreateFileReader.
   // The resolved FileSystemBackend could perform further specialization
   // depending on the filesystem type pointed by the |url|.
-  scoped_ptr<webkit_blob::FileStreamReader> CreateFileStreamReader(
+  scoped_ptr<storage::FileStreamReader> CreateFileStreamReader(
       const FileSystemURL& url,
       int64 offset,
       const base::Time& expected_modification_time);
@@ -371,7 +371,7 @@ class WEBKIT_STORAGE_BROWSER_EXPORT FileSystemContext
   scoped_refptr<base::SingleThreadTaskRunner> io_task_runner_;
   scoped_refptr<base::SequencedTaskRunner> default_file_task_runner_;
 
-  scoped_refptr<quota::QuotaManagerProxy> quota_manager_proxy_;
+  scoped_refptr<storage::QuotaManagerProxy> quota_manager_proxy_;
 
   scoped_ptr<SandboxFileSystemBackendDelegate> sandbox_delegate_;
 
@@ -417,6 +417,6 @@ struct DefaultContextDeleter {
   }
 };
 
-}  // namespace fileapi
+}  // namespace storage
 
 #endif  // WEBKIT_BROWSER_FILEAPI_FILE_SYSTEM_CONTEXT_H_