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

content/browser/indexed_db/indexed_db_quota_client.cc

Index: content/browser/indexed_db/indexed_db_quota_client.cc
diff --git a/content/browser/indexed_db/indexed_db_quota_client.cc b/content/browser/indexed_db/indexed_db_quota_client.cc
index 5e0cea898e046509ecbc651c1d84bb04e4a7d4b7..febe2e0e6535fbbfe5ac78f3922e2e3393562f0c 100644
--- a/content/browser/indexed_db/indexed_db_quota_client.cc
+++ b/content/browser/indexed_db/indexed_db_quota_client.cc
@@ -12,17 +12,17 @@
 #include "net/base/net_util.h"
 #include "webkit/browser/database/database_util.h"
 
-using quota::QuotaClient;
-using webkit_database::DatabaseUtil;
+using storage::QuotaClient;
+using storage::DatabaseUtil;
 
 namespace content {
 namespace {
 
-quota::QuotaStatusCode DeleteOriginDataOnIndexedDBThread(
+storage::QuotaStatusCode DeleteOriginDataOnIndexedDBThread(
     IndexedDBContextImpl* context,
     const GURL& origin) {
   context->DeleteForOrigin(origin);
-  return quota::kQuotaStatusOk;
+  return storage::kQuotaStatusOk;
 }
 
 int64 GetOriginUsageOnIndexedDBThread(IndexedDBContextImpl* context,
@@ -72,13 +72,13 @@ QuotaClient::ID IndexedDBQuotaClient::id() const { return kIndexedDatabase; }
 void IndexedDBQuotaClient::OnQuotaManagerDestroyed() { delete this; }
 
 void IndexedDBQuotaClient::GetOriginUsage(const GURL& origin_url,
-                                          quota::StorageType type,
+                                          storage::StorageType type,
                                           const GetUsageCallback& callback) {
   DCHECK(!callback.is_null());
   DCHECK(indexed_db_context_);
 
   // IndexedDB is in the temp namespace for now.
-  if (type != quota::kStorageTypeTemporary) {
+  if (type != storage::kStorageTypeTemporary) {
     callback.Run(0);
     return;
   }
@@ -98,13 +98,13 @@ void IndexedDBQuotaClient::GetOriginUsage(const GURL& origin_url,
 }
 
 void IndexedDBQuotaClient::GetOriginsForType(
-    quota::StorageType type,
+    storage::StorageType type,
     const GetOriginsCallback& callback) {
   DCHECK(!callback.is_null());
   DCHECK(indexed_db_context_);
 
   // All databases are in the temp namespace for now.
-  if (type != quota::kStorageTypeTemporary) {
+  if (type != storage::kStorageTypeTemporary) {
     callback.Run(std::set<GURL>());
     return;
   }
@@ -125,14 +125,14 @@ void IndexedDBQuotaClient::GetOriginsForType(
 }
 
 void IndexedDBQuotaClient::GetOriginsForHost(
-    quota::StorageType type,
+    storage::StorageType type,
     const std::string& host,
     const GetOriginsCallback& callback) {
   DCHECK(!callback.is_null());
   DCHECK(indexed_db_context_);
 
   // All databases are in the temp namespace for now.
-  if (type != quota::kStorageTypeTemporary) {
+  if (type != storage::kStorageTypeTemporary) {
     callback.Run(std::set<GURL>());
     return;
   }
@@ -154,16 +154,16 @@ void IndexedDBQuotaClient::GetOriginsForHost(
 }
 
 void IndexedDBQuotaClient::DeleteOriginData(const GURL& origin,
-                                            quota::StorageType type,
+                                            storage::StorageType type,
                                             const DeletionCallback& callback) {
-  if (type != quota::kStorageTypeTemporary) {
-    callback.Run(quota::kQuotaErrorNotSupported);
+  if (type != storage::kStorageTypeTemporary) {
+    callback.Run(storage::kQuotaErrorNotSupported);
     return;
   }
 
   // No task runner means unit test; no cleanup necessary.
   if (!indexed_db_context_->TaskRunner()) {
-    callback.Run(quota::kQuotaStatusOk);
+    callback.Run(storage::kQuotaStatusOk);
     return;
   }
 
@@ -175,8 +175,8 @@ void IndexedDBQuotaClient::DeleteOriginData(const GURL& origin,
       callback);
 }
 
-bool IndexedDBQuotaClient::DoesSupport(quota::StorageType type) const {
-  return type == quota::kStorageTypeTemporary;
+bool IndexedDBQuotaClient::DoesSupport(storage::StorageType type) const {
+  return type == storage::kStorageTypeTemporary;
 }
 
 }  // namespace content