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

content/public/test/test_file_system_context.h

Index: content/public/test/test_file_system_context.h
diff --git a/content/public/test/test_file_system_context.h b/content/public/test/test_file_system_context.h
index 8b7c872b87e7999f41028365fa4c2be0fda58670..e7e94da51e9f92c4a208d21043aded168af92679 100644
--- a/content/public/test/test_file_system_context.h
+++ b/content/public/test/test_file_system_context.h
@@ -9,38 +9,37 @@
 #include "base/memory/scoped_vector.h"
 #include "webkit/browser/fileapi/file_system_context.h"
 
-namespace quota {
+namespace storage {
 class QuotaManagerProxy;
 class SpecialStoragePolicy;
 }
 
-namespace fileapi {
+namespace storage {
 class FileSystemBackend;
 }
 
 namespace content {
 
-fileapi::FileSystemContext* CreateFileSystemContextForTesting(
-    quota::QuotaManagerProxy* quota_manager_proxy,
+storage::FileSystemContext* CreateFileSystemContextForTesting(
+    storage::QuotaManagerProxy* quota_manager_proxy,
     const base::FilePath& base_path);
 
 // The caller is responsible for including TestFileSystemBackend in
 // |additional_providers| if needed.
-fileapi::FileSystemContext*
-CreateFileSystemContextWithAdditionalProvidersForTesting(
-    quota::QuotaManagerProxy* quota_manager_proxy,
-    ScopedVector<fileapi::FileSystemBackend> additional_providers,
+storage::FileSystemContext*
+    CreateFileSystemContextWithAdditionalProvidersForTesting(
+        storage::QuotaManagerProxy* quota_manager_proxy,
+        ScopedVector<storage::FileSystemBackend> additional_providers,
+        const base::FilePath& base_path);
+
+storage::FileSystemContext* CreateFileSystemContextWithAutoMountersForTesting(
+    storage::QuotaManagerProxy* quota_manager_proxy,
+    ScopedVector<storage::FileSystemBackend> additional_providers,
+    const std::vector<storage::URLRequestAutoMountHandler>& auto_mounters,
     const base::FilePath& base_path);
 
-fileapi::FileSystemContext*
-CreateFileSystemContextWithAutoMountersForTesting(
-    quota::QuotaManagerProxy* quota_manager_proxy,
-    ScopedVector<fileapi::FileSystemBackend> additional_providers,
-    const std::vector<fileapi::URLRequestAutoMountHandler>& auto_mounters,
-    const base::FilePath& base_path);
-
-fileapi::FileSystemContext* CreateIncognitoFileSystemContextForTesting(
-    quota::QuotaManagerProxy* quota_manager_proxy,
+storage::FileSystemContext* CreateIncognitoFileSystemContextForTesting(
+    storage::QuotaManagerProxy* quota_manager_proxy,
     const base::FilePath& base_path);
 
 }  // namespace content