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

content/shell/browser/shell_message_filter.cc

Index: content/shell/browser/shell_message_filter.cc
diff --git a/content/shell/browser/shell_message_filter.cc b/content/shell/browser/shell_message_filter.cc
index fa21034c10fe40af72be0e8c21ab84644deabcc3..c045cdfa67bfdcfa3e16f949ad8b9232c56e1b00 100644
--- a/content/shell/browser/shell_message_filter.cc
+++ b/content/shell/browser/shell_message_filter.cc
@@ -24,8 +24,8 @@ namespace content {
 
 ShellMessageFilter::ShellMessageFilter(
     int render_process_id,
-    webkit_database::DatabaseTracker* database_tracker,
-    quota::QuotaManager* quota_manager,
+    storage::DatabaseTracker* database_tracker,
+    storage::QuotaManager* quota_manager,
     net::URLRequestContextGetter* request_context_getter)
     : BrowserMessageFilter(ShellMsgStart),
       render_process_id_(render_process_id),
@@ -74,7 +74,7 @@ void ShellMessageFilter::OnReadFileToString(const base::FilePath& local_file,
 void ShellMessageFilter::OnRegisterIsolatedFileSystem(
     const std::vector<base::FilePath>& absolute_filenames,
     std::string* filesystem_id) {
-  fileapi::IsolatedContext::FileInfoSet files;
+  storage::IsolatedContext::FileInfoSet files;
   ChildProcessSecurityPolicy* policy =
       ChildProcessSecurityPolicy::GetInstance();
   for (size_t i = 0; i < absolute_filenames.size(); ++i) {
@@ -83,7 +83,7 @@ void ShellMessageFilter::OnRegisterIsolatedFileSystem(
       policy->GrantReadFile(render_process_id_, absolute_filenames[i]);
   }
   *filesystem_id =
-      fileapi::IsolatedContext::GetInstance()->RegisterDraggedFileSystem(files);
+      storage::IsolatedContext::GetInstance()->RegisterDraggedFileSystem(files);
   policy->GrantReadFileSystem(render_process_id_, *filesystem_id);
 }
 
@@ -95,8 +95,8 @@ void ShellMessageFilter::OnClearAllDatabases() {
 
 void ShellMessageFilter::OnSetDatabaseQuota(int quota) {
   quota_manager_->SetTemporaryGlobalOverrideQuota(
-      quota * quota::QuotaManager::kPerHostTemporaryPortion,
-      quota::QuotaCallback());
+      quota * storage::QuotaManager::kPerHostTemporaryPortion,
+      storage::QuotaCallback());
 }
 
 void ShellMessageFilter::OnCheckWebNotificationPermission(const GURL& origin,