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

webkit/browser/fileapi/quota/quota_backend_impl.cc

Index: webkit/browser/fileapi/quota/quota_backend_impl.cc
diff --git a/webkit/browser/fileapi/quota/quota_backend_impl.cc b/webkit/browser/fileapi/quota/quota_backend_impl.cc
index de0b3ac0369ce9c842c899f086e82f354a1f3ceb..fe2e11db1a2f582a22035df1dc87aaffde6bb60b 100644
--- a/webkit/browser/fileapi/quota/quota_backend_impl.cc
+++ b/webkit/browser/fileapi/quota/quota_backend_impl.cc
@@ -16,13 +16,13 @@
 #include "webkit/browser/quota/quota_manager_proxy.h"
 #include "webkit/common/fileapi/file_system_util.h"
 
-namespace fileapi {
+namespace storage {
 
 QuotaBackendImpl::QuotaBackendImpl(
     base::SequencedTaskRunner* file_task_runner,
     ObfuscatedFileUtil* obfuscated_file_util,
     FileSystemUsageCache* file_system_usage_cache,
-    quota::QuotaManagerProxy* quota_manager_proxy)
+    storage::QuotaManagerProxy* quota_manager_proxy)
     : file_task_runner_(file_task_runner),
       obfuscated_file_util_(obfuscated_file_util),
       file_system_usage_cache_(file_system_usage_cache),
@@ -102,12 +102,14 @@ void QuotaBackendImpl::DecrementDirtyCount(const GURL& origin,
 void QuotaBackendImpl::DidGetUsageAndQuotaForReserveQuota(
     const QuotaReservationInfo& info,
     const ReserveQuotaCallback& callback,
-    quota::QuotaStatusCode status, int64 usage, int64 quota) {
+    storage::QuotaStatusCode status,
+    int64 usage,
+    int64 quota) {
   DCHECK(file_task_runner_->RunsTasksOnCurrentThread());
   DCHECK(info.origin.is_valid());
   DCHECK_LE(0, usage);
   DCHECK_LE(0, quota);
-  if (status != quota::kQuotaStatusOk) {
+  if (status != storage::kQuotaStatusOk) {
     callback.Run(base::File::FILE_ERROR_FAILED, 0);
     return;
   }
@@ -136,8 +138,10 @@ void QuotaBackendImpl::ReserveQuotaInternal(const QuotaReservationInfo& info) {
   DCHECK(info.origin.is_valid());
   DCHECK(quota_manager_proxy_);
   quota_manager_proxy_->NotifyStorageModified(
-      quota::QuotaClient::kFileSystem, info.origin,
-      FileSystemTypeToQuotaStorageType(info.type), info.delta);
+      storage::QuotaClient::kFileSystem,
+      info.origin,
+      FileSystemTypeToQuotaStorageType(info.type),
+      info.delta);
 }
 
 base::File::Error QuotaBackendImpl::GetUsageCachePath(
@@ -162,4 +166,4 @@ QuotaBackendImpl::QuotaReservationInfo::QuotaReservationInfo(
 QuotaBackendImpl::QuotaReservationInfo::~QuotaReservationInfo() {
 }
 
-}  // namespace fileapi
+}  // namespace storage