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

chrome/browser/sessions/session_data_deleter.cc

Index: chrome/browser/sessions/session_data_deleter.cc
diff --git a/chrome/browser/sessions/session_data_deleter.cc b/chrome/browser/sessions/session_data_deleter.cc
index 2eba98c8f80fc15f52fdb9b12af8b5fb6248a5a2..9f8248fcc80120e8710212f3cfcaf84e39856362 100644
--- a/chrome/browser/sessions/session_data_deleter.cc
+++ b/chrome/browser/sessions/session_data_deleter.cc
@@ -29,7 +29,7 @@ void CookieDeleted(bool success) {
 class SessionDataDeleter
     : public base::RefCountedThreadSafe<SessionDataDeleter> {
  public:
-  SessionDataDeleter(quota::SpecialStoragePolicy* storage_policy,
+  SessionDataDeleter(storage::SpecialStoragePolicy* storage_policy,
                      bool delete_only_by_session_only_policy);
 
   void Run(content::StoragePartition* storage_partition,
@@ -59,17 +59,18 @@ class SessionDataDeleter
   void DeleteSessionOnlyOriginCookies(const net::CookieList& cookies);
 
   scoped_refptr<net::CookieMonster> cookie_monster_;
-  scoped_refptr<quota::SpecialStoragePolicy> storage_policy_;
+  scoped_refptr<storage::SpecialStoragePolicy> storage_policy_;
   const bool delete_only_by_session_only_policy_;
 
   DISALLOW_COPY_AND_ASSIGN(SessionDataDeleter);
 };
 
 SessionDataDeleter::SessionDataDeleter(
-    quota::SpecialStoragePolicy* storage_policy,
+    storage::SpecialStoragePolicy* storage_policy,
     bool delete_only_by_session_only_policy)
     : storage_policy_(storage_policy),
-      delete_only_by_session_only_policy_(delete_only_by_session_only_policy) {}
+      delete_only_by_session_only_policy_(delete_only_by_session_only_policy) {
+}
 
 void SessionDataDeleter::Run(content::StoragePartition* storage_partition,
                              ProfileIOData* profile_io_data) {