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

content/browser/appcache/appcache_service_impl.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_BROWSER_APPCACHE_APPCACHE_SERVICE_IMPL_H_
 #define CONTENT_BROWSER_APPCACHE_APPCACHE_SERVICE_IMPL_H_
 
 #include <map>
 #include <set>
 
@@ skipping 12 matching lines @@
 
 namespace base {
 class FilePath;
 class SingleThreadTaskRunner;
 }  // namespace base
 
 namespace net {
 class URLRequestContext;
 }  // namespace net
 
-namespace quota {
+namespace storage {
 class SpecialStoragePolicy;
-}  // namespace quota
+}  // namespace storage
 
 namespace content {
 FORWARD_DECLARE_TEST(AppCacheServiceImplTest, ScheduleReinitialize);
 class AppCacheBackendImpl;
 class AppCacheExecutableHandlerFactory;
 class AppCacheQuotaClient;
 class AppCachePolicy;
 class AppCacheServiceImplTest;
 class AppCacheStorageImplTest;
 class AppCacheStorage;
@@ skipping 25 matching lines @@
     // An observer method to inform consumers of reinitialzation. Managing
     // the lifetime of the old storage instance is a delicate process.
     // Consumers can keep the old disabled instance alive by hanging on to the
     // ref provided.
     virtual void OnServiceReinitialized(
         AppCacheStorageReference* old_storage_ref) = 0;
     virtual ~Observer() {}
   };
 
   // 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(
       const base::FilePath& cache_directory,
       const scoped_refptr<base::SingleThreadTaskRunner>& db_thread,
       const scoped_refptr<base::SingleThreadTaskRunner>& cache_thread);
 
   void AddObserver(Observer* observer) {
     observers_.AddObserver(observer);
   }
@@ skipping 51 matching lines @@
   // The service does NOT assume ownership of the factory, it is the callers
   // responsibility to ensure that the pointer remains valid while set.
   AppCacheExecutableHandlerFactory* handler_factory() const {
     return handler_factory_;
   }
   void set_handler_factory(
       AppCacheExecutableHandlerFactory* factory) {
     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();
   }
 
   AppCacheQuotaClient* quota_client() const {
     return quota_client_;
   }
 
   // Each child process in chrome uses a distinct backend instance.
   // See chrome/browser/AppCacheDispatcherHost.
   void RegisterBackend(AppCacheBackendImpl* backend_impl);
@@ skipping 27 matching lines @@
 
   void Reinitialize();
 
   base::FilePath cache_directory_;
   scoped_refptr<base::SingleThreadTaskRunner> db_thread_;
   scoped_refptr<base::SingleThreadTaskRunner> cache_thread_;
   AppCachePolicy* appcache_policy_;
   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.
   net::URLRequestContext* request_context_;
   // If true, nothing (not even session-only data) should be deleted on exit.
   bool force_keep_session_state_;
   base::Time last_reinit_time_;
   base::TimeDelta next_reinit_delay_;
   base::OneShotTimer<AppCacheServiceImpl> reinit_timer_;
   ObserverList<Observer> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(AppCacheServiceImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_APPCACHE_APPCACHE_SERVICE_IMPL_H_