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

content/browser/appcache/chrome_appcache_service.h

 // Copyright (c) 2012 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_CHROME_APPCACHE_SERVICE_H_
 #define CONTENT_BROWSER_APPCACHE_CHROME_APPCACHE_SERVICE_H_
 
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/sequenced_task_runner_helpers.h"
@@ skipping 25 matching lines @@
 // the IO thread (unless specifically called out in doc comments).
 //
 // TODO(dpranke): Fix dependencies on AppCacheServiceImpl so that we don't have
 // to worry about clients calling AppCacheServiceImpl methods.
 class CONTENT_EXPORT ChromeAppCacheService
     : public base::RefCountedThreadSafe<ChromeAppCacheService,
                                         ChromeAppCacheServiceDeleter>,
       NON_EXPORTED_BASE(public AppCacheServiceImpl),
       NON_EXPORTED_BASE(public AppCachePolicy) {
  public:
-  explicit ChromeAppCacheService(quota::QuotaManagerProxy* proxy);
+  explicit ChromeAppCacheService(storage::QuotaManagerProxy* proxy);
 
   // If |cache_path| is empty we will use in-memory structs.
   void InitializeOnIOThread(
       const base::FilePath& cache_path,
       ResourceContext* resource_context,
       net::URLRequestContextGetter* request_context_getter,
-      scoped_refptr<quota::SpecialStoragePolicy> special_storage_policy);
+      scoped_refptr<storage::SpecialStoragePolicy> special_storage_policy);
 
   // AppCachePolicy overrides
   virtual bool CanLoadAppCache(const GURL& manifest_url,
                                const GURL& first_party) OVERRIDE;
   virtual bool CanCreateAppCache(const GURL& manifest_url,
                                  const GURL& first_party) OVERRIDE;
 
  protected:
   virtual ~ChromeAppCacheService();
 
@@ skipping 13 matching lines @@
 
 struct ChromeAppCacheServiceDeleter {
   static void Destruct(const ChromeAppCacheService* service) {
     service->DeleteOnCorrectThread();
   }
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_APPCACHE_CHROME_APPCACHE_SERVICE_H_