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

content/shell/browser/shell_browser_main_parts.cc

Index: content/shell/browser/shell_browser_main_parts.cc
diff --git a/content/shell/browser/shell_browser_main_parts.cc b/content/shell/browser/shell_browser_main_parts.cc
index 32dc6093cfb7b29da6694189d06fd76f295d283a..0c3307651becee6f400f048d7b223168c0d740ed 100644
--- a/content/shell/browser/shell_browser_main_parts.cc
+++ b/content/shell/browser/shell_browser_main_parts.cc
@@ -146,17 +146,17 @@ void ShellBrowserMainParts::PreMainMessageLoopRun() {
   }
 
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree)) {
-    quota::QuotaManager* quota_manager =
+    storage::QuotaManager* quota_manager =
         BrowserContext::GetDefaultStoragePartition(browser_context())
             ->GetQuotaManager();
     BrowserThread::PostTask(
         BrowserThread::IO,
         FROM_HERE,
-        base::Bind(&quota::QuotaManager::SetTemporaryGlobalOverrideQuota,
+        base::Bind(&storage::QuotaManager::SetTemporaryGlobalOverrideQuota,
                    quota_manager,
                    kDefaultLayoutTestQuotaBytes *
-                       quota::QuotaManager::kPerHostTemporaryPortion,
-                   quota::QuotaCallback()));
+                       storage::QuotaManager::kPerHostTemporaryPortion,
+                   storage::QuotaCallback()));
 #if defined(ENABLE_PLUGINS)
     PluginService* plugin_service = PluginService::GetInstance();
     plugin_service_filter_.reset(new ShellPluginServiceFilter);