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

content/browser/appcache/chrome_appcache_service.cc

 // 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.
 
 #include "content/browser/appcache/chrome_appcache_service.h"
 
 #include "base/files/file_path.h"
 #include "content/browser/appcache/appcache_storage_impl.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/resource_context.h"
 #include "net/base/net_errors.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "webkit/browser/quota/quota_manager.h"
 
 namespace content {
 
 ChromeAppCacheService::ChromeAppCacheService(
-    quota::QuotaManagerProxy* quota_manager_proxy)
-    : AppCacheServiceImpl(quota_manager_proxy),
-      resource_context_(NULL) {
+    storage::QuotaManagerProxy* quota_manager_proxy)
+    : AppCacheServiceImpl(quota_manager_proxy), resource_context_(NULL) {
 }
 
 void ChromeAppCacheService::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) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   cache_path_ = cache_path;
   resource_context_ = resource_context;
 
   // The |request_context_getter| can be NULL in some unit tests.
   //
   // TODO(ajwong): TestProfile is difficult to work with. The
   // SafeBrowsing tests require that GetRequestContext return NULL
   // so we can't depend on having a non-NULL value here. See crbug/149783.
@@ skipping 34 matching lines @@
     return;
   }
   if (BrowserThread::IsMessageLoopValid(BrowserThread::IO)) {
     BrowserThread::DeleteSoon(BrowserThread::IO, FROM_HERE, this);
     return;
   }
   // Better to leak than crash on shutdown.
 }
 
 }  // namespace content