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

content/browser/appcache/appcache_quota_client.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/appcache_quota_client.h"
 
 #include <algorithm>
 #include <map>
 #include <set>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "content/browser/appcache/appcache_service_impl.h"
 
-using quota::QuotaClient;
+using storage::QuotaClient;
 
 namespace {
-quota::QuotaStatusCode NetErrorCodeToQuotaStatus(int code) {
+storage::QuotaStatusCode NetErrorCodeToQuotaStatus(int code) {
   if (code == net::OK)
-    return quota::kQuotaStatusOk;
+    return storage::kQuotaStatusOk;
   else if (code == net::ERR_ABORTED)
-    return quota::kQuotaErrorAbort;
+    return storage::kQuotaErrorAbort;
   else
-    return quota::kQuotaStatusUnknown;
+    return storage::kQuotaStatusUnknown;
 }
 
 void RunFront(content::AppCacheQuotaClient::RequestQueue* queue) {
   base::Closure request = queue->front();
   queue->pop_front();
   request.Run();
 }
 }  // namespace
 
 namespace content {
@@ skipping 19 matching lines @@
   if (!current_delete_request_callback_.is_null()) {
     current_delete_request_callback_.Reset();
     GetServiceDeleteCallback()->Cancel();
   }
 
   quota_manager_is_destroyed_ = true;
   if (!service_)
     delete this;
 }
 
-void AppCacheQuotaClient::GetOriginUsage(
-    const GURL& origin,
-    quota::StorageType type,
-    const GetUsageCallback& callback) {
+void AppCacheQuotaClient::GetOriginUsage(const GURL& origin,
+                                         storage::StorageType type,
+                                         const GetUsageCallback& callback) {
   DCHECK(!callback.is_null());
   DCHECK(!quota_manager_is_destroyed_);
 
   if (!service_) {
     callback.Run(0);
     return;
   }
 
   if (!appcache_is_ready_) {
     pending_batch_requests_.push_back(
         base::Bind(&AppCacheQuotaClient::GetOriginUsage,
                    base::Unretained(this), origin, type, callback));
     return;
   }
 
-  if (type != quota::kStorageTypeTemporary) {
+  if (type != storage::kStorageTypeTemporary) {
     callback.Run(0);
     return;
   }
 
   const AppCacheStorage::UsageMap* map = GetUsageMap();
   AppCacheStorage::UsageMap::const_iterator found = map->find(origin);
   if (found == map->end()) {
     callback.Run(0);
     return;
   }
   callback.Run(found->second);
 }
 
 void AppCacheQuotaClient::GetOriginsForType(
-    quota::StorageType type,
+    storage::StorageType type,
     const GetOriginsCallback& callback) {
   GetOriginsHelper(type, std::string(), callback);
 }
 
 void AppCacheQuotaClient::GetOriginsForHost(
-    quota::StorageType type,
+    storage::StorageType type,
     const std::string& host,
     const GetOriginsCallback& callback) {
   DCHECK(!callback.is_null());
   if (host.empty()) {
     callback.Run(std::set<GURL>());
     return;
   }
   GetOriginsHelper(type, host, callback);
 }
 
 void AppCacheQuotaClient::DeleteOriginData(const GURL& origin,
-                                           quota::StorageType type,
+                                           storage::StorageType type,
                                            const DeletionCallback& callback) {
   DCHECK(!quota_manager_is_destroyed_);
 
   if (!service_) {
-    callback.Run(quota::kQuotaErrorAbort);
+    callback.Run(storage::kQuotaErrorAbort);
     return;
   }
 
   if (!appcache_is_ready_ || !current_delete_request_callback_.is_null()) {
     pending_serial_requests_.push_back(
         base::Bind(&AppCacheQuotaClient::DeleteOriginData,
                    base::Unretained(this), origin, type, callback));
     return;
   }
 
   current_delete_request_callback_ = callback;
-  if (type != quota::kStorageTypeTemporary) {
+  if (type != storage::kStorageTypeTemporary) {
     DidDeleteAppCachesForOrigin(net::OK);
     return;
   }
 
   service_->DeleteAppCachesForOrigin(
       origin, GetServiceDeleteCallback()->callback());
 }
 
-bool AppCacheQuotaClient::DoesSupport(quota::StorageType type) const {
-  return type == quota::kStorageTypeTemporary;
+bool AppCacheQuotaClient::DoesSupport(storage::StorageType type) const {
+  return type == storage::kStorageTypeTemporary;
 }
 
 void AppCacheQuotaClient::DidDeleteAppCachesForOrigin(int rv) {
   DCHECK(service_);
   if (quota_manager_is_destroyed_)
     return;
 
   // Finish the request by calling our callers callback.
   current_delete_request_callback_.Run(NetErrorCodeToQuotaStatus(rv));
   current_delete_request_callback_.Reset();
   if (pending_serial_requests_.empty())
     return;
 
   // Start the next in the queue.
   RunFront(&pending_serial_requests_);
 }
 
-void AppCacheQuotaClient::GetOriginsHelper(
-    quota::StorageType type,
-    const std::string& opt_host,
-    const GetOriginsCallback& callback) {
+void AppCacheQuotaClient::GetOriginsHelper(storage::StorageType type,
+                                           const std::string& opt_host,
+                                           const GetOriginsCallback& callback) {
   DCHECK(!callback.is_null());
   DCHECK(!quota_manager_is_destroyed_);
 
   if (!service_) {
     callback.Run(std::set<GURL>());
     return;
   }
 
   if (!appcache_is_ready_) {
     pending_batch_requests_.push_back(
         base::Bind(&AppCacheQuotaClient::GetOriginsHelper,
                    base::Unretained(this), type, opt_host, callback));
     return;
   }
 
-  if (type != quota::kStorageTypeTemporary) {
+  if (type != storage::kStorageTypeTemporary) {
     callback.Run(std::set<GURL>());
     return;
   }
 
   const AppCacheStorage::UsageMap* map = GetUsageMap();
   std::set<GURL> origins;
   for (AppCacheStorage::UsageMap::const_iterator iter = map->begin();
        iter != map->end(); ++iter) {
     if (opt_host.empty() || iter->first.host() == opt_host)
       origins.insert(iter->first);
@@ skipping 43 matching lines @@
 
 void AppCacheQuotaClient::NotifyAppCacheDestroyed() {
   service_ = NULL;
   while (!pending_batch_requests_.empty())
     RunFront(&pending_batch_requests_);
 
   while (!pending_serial_requests_.empty())
     RunFront(&pending_serial_requests_);
 
   if (!current_delete_request_callback_.is_null()) {
-    current_delete_request_callback_.Run(quota::kQuotaErrorAbort);
+    current_delete_request_callback_.Run(storage::kQuotaErrorAbort);
     current_delete_request_callback_.Reset();
     GetServiceDeleteCallback()->Cancel();
   }
 
   if (quota_manager_is_destroyed_)
     delete this;
 }
 
 }  // namespace content