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

content/browser/renderer_host/database_message_filter.cc

Index: content/browser/renderer_host/database_message_filter.cc
diff --git a/content/browser/renderer_host/database_message_filter.cc b/content/browser/renderer_host/database_message_filter.cc
index 7c7b9a36b1b646669b52cdf8d0cf49975be44ca3..08c431897045e2cbb9ebb2834b4719e3cb1a44d6 100644
--- a/content/browser/renderer_host/database_message_filter.cc
+++ b/content/browser/renderer_host/database_message_filter.cc
@@ -24,11 +24,11 @@
 #include "base/file_descriptor_posix.h"
 #endif
 
-using quota::QuotaManager;
-using quota::QuotaStatusCode;
-using webkit_database::DatabaseTracker;
-using webkit_database::DatabaseUtil;
-using webkit_database::VfsBackend;
+using storage::QuotaManager;
+using storage::QuotaStatusCode;
+using storage::DatabaseTracker;
+using storage::DatabaseUtil;
+using storage::VfsBackend;
 
 namespace content {
 namespace {
@@ -39,7 +39,7 @@ const int kDelayDeleteRetryMs = 100;
 }  // namespace
 
 DatabaseMessageFilter::DatabaseMessageFilter(
-    webkit_database::DatabaseTracker* db_tracker)
+    storage::DatabaseTracker* db_tracker)
     : BrowserMessageFilter(DatabaseMsgStart),
       db_tracker_(db_tracker),
       observer_added_(false) {
@@ -270,19 +270,19 @@ void DatabaseMessageFilter::OnDatabaseGetSpaceAvailable(
   }
 
   quota_manager->GetUsageAndQuota(
-      webkit_database::GetOriginFromIdentifier(origin_identifier),
-      quota::kStorageTypeTemporary,
-      base::Bind(&DatabaseMessageFilter::OnDatabaseGetUsageAndQuota,
-                 this, reply_msg));
+      storage::GetOriginFromIdentifier(origin_identifier),
+      storage::kStorageTypeTemporary,
+      base::Bind(
+          &DatabaseMessageFilter::OnDatabaseGetUsageAndQuota, this, reply_msg));
 }
 
 void DatabaseMessageFilter::OnDatabaseGetUsageAndQuota(
     IPC::Message* reply_msg,
-    quota::QuotaStatusCode status,
+    storage::QuotaStatusCode status,
     int64 usage,
     int64 quota) {
   int64 available = 0;
-  if ((status == quota::kQuotaStatusOk) && (usage < quota))
+  if ((status == storage::kQuotaStatusOk) && (usage < quota))
     available = quota - usage;
   DatabaseHostMsg_GetSpaceAvailable::WriteReplyParams(reply_msg, available);
   Send(reply_msg);