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

content/browser/dom_storage/dom_storage_context_impl.h

Index: content/browser/dom_storage/dom_storage_context_impl.h
diff --git a/content/browser/dom_storage/dom_storage_context_impl.h b/content/browser/dom_storage/dom_storage_context_impl.h
index d256d9c5723f22e1e6164d3248d1f64607a9e354..bd1acbfba222ec29f4ad74112faa5c1981417416 100644
--- a/content/browser/dom_storage/dom_storage_context_impl.h
+++ b/content/browser/dom_storage/dom_storage_context_impl.h
@@ -27,7 +27,7 @@ class NullableString16;
 class Time;
 }
 
-namespace quota {
+namespace storage {
 class SpecialStoragePolicy;
 }
 
@@ -91,11 +91,10 @@ class CONTENT_EXPORT DOMStorageContextImpl
 
   // |localstorage_directory| and |sessionstorage_directory| may be empty
   // for incognito browser contexts.
-  DOMStorageContextImpl(
-      const base::FilePath& localstorage_directory,
-      const base::FilePath& sessionstorage_directory,
-      quota::SpecialStoragePolicy* special_storage_policy,
-      DOMStorageTaskRunner* task_runner);
+  DOMStorageContextImpl(const base::FilePath& localstorage_directory,
+                        const base::FilePath& sessionstorage_directory,
+                        storage::SpecialStoragePolicy* special_storage_policy,
+                        DOMStorageTaskRunner* task_runner);
 
   // Returns the directory path for localStorage, or an empty directory, if
   // there is no backing on disk.
@@ -231,7 +230,7 @@ class CONTENT_EXPORT DOMStorageContextImpl
 
   bool is_shutdown_;
   bool force_keep_session_state_;
-  scoped_refptr<quota::SpecialStoragePolicy> special_storage_policy_;
+  scoped_refptr<storage::SpecialStoragePolicy> special_storage_policy_;
   scoped_refptr<SessionStorageDatabase> session_storage_database_;
 
   // For cleaning up unused namespaces gradually.