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

chrome/browser/net/sqlite_channel_id_store.cc

Index: chrome/browser/net/sqlite_channel_id_store.cc
diff --git a/chrome/browser/net/sqlite_channel_id_store.cc b/chrome/browser/net/sqlite_channel_id_store.cc
index 15bad3dc31ae909ed3d5d4d1ed73ba8f86058cc3..374a5dc6d89900b89e1fba039b9f27ec8a1ddcba 100644
--- a/chrome/browser/net/sqlite_channel_id_store.cc
+++ b/chrome/browser/net/sqlite_channel_id_store.cc
@@ -36,7 +36,7 @@ class SQLiteChannelIDStore::Backend
   Backend(
       const base::FilePath& path,
       const scoped_refptr<base::SequencedTaskRunner>& background_task_runner,
-      quota::SpecialStoragePolicy* special_storage_policy)
+      storage::SpecialStoragePolicy* special_storage_policy)
       : path_(path),
         num_pending_(0),
         force_keep_session_state_(false),
@@ -130,7 +130,7 @@ class SQLiteChannelIDStore::Backend
 
   scoped_refptr<base::SequencedTaskRunner> background_task_runner_;
 
-  scoped_refptr<quota::SpecialStoragePolicy> special_storage_policy_;
+  scoped_refptr<storage::SpecialStoragePolicy> special_storage_policy_;
 
   // Indicates if the kill-database callback has been scheduled.
   bool corruption_detected_;
@@ -610,10 +610,10 @@ void SQLiteChannelIDStore::Backend::SetForceKeepSessionState() {
 SQLiteChannelIDStore::SQLiteChannelIDStore(
     const base::FilePath& path,
     const scoped_refptr<base::SequencedTaskRunner>& background_task_runner,
-    quota::SpecialStoragePolicy* special_storage_policy)
-    : backend_(new Backend(path,
-                           background_task_runner,
-                           special_storage_policy)) {}
+    storage::SpecialStoragePolicy* special_storage_policy)
+    : backend_(
+          new Backend(path, background_task_runner, special_storage_policy)) {
+}
 
 void SQLiteChannelIDStore::Load(
     const LoadedCallback& loaded_callback) {