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

content/browser/renderer_host/database_message_filter.h

Index: content/browser/renderer_host/database_message_filter.h
diff --git a/content/browser/renderer_host/database_message_filter.h b/content/browser/renderer_host/database_message_filter.h
index aa99e03c4e0924f06278ac754f8d6011a9eca2da..6e4e95bcd08f9291b620ae437ecbabf2cba425f5 100644
--- a/content/browser/renderer_host/database_message_filter.h
+++ b/content/browser/renderer_host/database_message_filter.h
@@ -14,11 +14,10 @@
 
 namespace content {
 
-class DatabaseMessageFilter
-    : public BrowserMessageFilter,
-      public webkit_database::DatabaseTracker::Observer {
+class DatabaseMessageFilter : public BrowserMessageFilter,
+                              public storage::DatabaseTracker::Observer {
  public:
-  explicit DatabaseMessageFilter(webkit_database::DatabaseTracker* db_tracker);
+  explicit DatabaseMessageFilter(storage::DatabaseTracker* db_tracker);
 
   // BrowserMessageFilter implementation.
   virtual void OnChannelClosing() OVERRIDE;
@@ -27,7 +26,7 @@ class DatabaseMessageFilter
       BrowserThread::ID* thread) OVERRIDE;
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
 
-  webkit_database::DatabaseTracker* database_tracker() const {
+  storage::DatabaseTracker* database_tracker() const {
     return db_tracker_.get();
   }
 
@@ -55,7 +54,7 @@ class DatabaseMessageFilter
   void OnDatabaseGetSpaceAvailable(const std::string& origin_identifier,
                                    IPC::Message* reply_msg);
   void OnDatabaseGetUsageAndQuota(IPC::Message* reply_msg,
-                                  quota::QuotaStatusCode status,
+                                  storage::QuotaStatusCode status,
                                   int64 usage,
                                   int64 quota);
 
@@ -86,14 +85,14 @@ class DatabaseMessageFilter
                           int reschedule_count);
 
   // The database tracker for the current browser context.
-  scoped_refptr<webkit_database::DatabaseTracker> db_tracker_;
+  scoped_refptr<storage::DatabaseTracker> db_tracker_;
 
   // True if and only if this instance was added as an observer
   // to DatabaseTracker.
   bool observer_added_;
 
   // Keeps track of all DB connections opened by this renderer
-  webkit_database::DatabaseConnections database_connections_;
+  storage::DatabaseConnections database_connections_;
 };
 
 }  // namespace content