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

content/browser/appcache/appcache_service_impl.h

Index: content/browser/appcache/appcache_service_impl.h
diff --git a/content/browser/appcache/appcache_service_impl.h b/content/browser/appcache/appcache_service_impl.h
index 3098719d4ff7a0be8ee6a49e17df1eedec1a1451..390c3935cdf23511c306a8051472c647f0173c90 100644
--- a/content/browser/appcache/appcache_service_impl.h
+++ b/content/browser/appcache/appcache_service_impl.h
@@ -30,9 +30,9 @@ namespace net {
 class URLRequestContext;
 }  // namespace net
 
-namespace quota {
+namespace storage {
 class SpecialStoragePolicy;
-}  // namespace quota
+}  // namespace storage
 
 namespace content {
 FORWARD_DECLARE_TEST(AppCacheServiceImplTest, ScheduleReinitialize);
@@ -78,7 +78,7 @@ class CONTENT_EXPORT AppCacheServiceImpl
   };
 
   // If not using quota management, the proxy may be NULL.
-  explicit AppCacheServiceImpl(quota::QuotaManagerProxy* quota_manager_proxy);
+  explicit AppCacheServiceImpl(storage::QuotaManagerProxy* quota_manager_proxy);
   virtual ~AppCacheServiceImpl();
 
   void Initialize(
@@ -150,12 +150,12 @@ class CONTENT_EXPORT AppCacheServiceImpl
     handler_factory_ = factory;
   }
 
-  quota::SpecialStoragePolicy* special_storage_policy() const {
+  storage::SpecialStoragePolicy* special_storage_policy() const {
     return special_storage_policy_.get();
   }
-  void set_special_storage_policy(quota::SpecialStoragePolicy* policy);
+  void set_special_storage_policy(storage::SpecialStoragePolicy* policy);
 
-  quota::QuotaManagerProxy* quota_manager_proxy() const {
+  storage::QuotaManagerProxy* quota_manager_proxy() const {
     return quota_manager_proxy_.get();
   }
 
@@ -203,8 +203,8 @@ class CONTENT_EXPORT AppCacheServiceImpl
   AppCacheQuotaClient* quota_client_;
   AppCacheExecutableHandlerFactory* handler_factory_;
   scoped_ptr<AppCacheStorage> storage_;
-  scoped_refptr<quota::SpecialStoragePolicy> special_storage_policy_;
-  scoped_refptr<quota::QuotaManagerProxy> quota_manager_proxy_;
+  scoped_refptr<storage::SpecialStoragePolicy> special_storage_policy_;
+  scoped_refptr<storage::QuotaManagerProxy> quota_manager_proxy_;
   PendingAsyncHelpers pending_helpers_;
   BackendMap backends_;  // One 'backend' per child process.
   // Context for use during cache updates.