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

content/browser/fileapi/fileapi_message_filter_unittest.cc

Index: content/browser/fileapi/fileapi_message_filter_unittest.cc
diff --git a/content/browser/fileapi/fileapi_message_filter_unittest.cc b/content/browser/fileapi/fileapi_message_filter_unittest.cc
index 3a4c47e93eb758cd66dac8d55b1a67cf9aad35e1..ddd3028a8748f6d88e63eeaa25a1497e00b83706 100644
--- a/content/browser/fileapi/fileapi_message_filter_unittest.cc
+++ b/content/browser/fileapi/fileapi_message_filter_unittest.cc
@@ -52,13 +52,13 @@ class FileAPIMessageFilterTest : public testing::Test {
     file_system_context_ =
         CreateFileSystemContextForTesting(NULL, base::FilePath());
 
-    std::vector<fileapi::FileSystemType> types;
+    std::vector<storage::FileSystemType> types;
     file_system_context_->GetFileSystemTypes(&types);
     for (size_t i = 0; i < types.size(); ++i) {
-      ChildProcessSecurityPolicyImpl::GetInstance()->
-          RegisterFileSystemPermissionPolicy(
+      ChildProcessSecurityPolicyImpl::GetInstance()
+          ->RegisterFileSystemPermissionPolicy(
               types[i],
-              fileapi::FileSystemContext::GetPermissionPolicy(types[i]));
+              storage::FileSystemContext::GetPermissionPolicy(types[i]));
     }
 
     stream_context_ = StreamContext::GetFor(&browser_context_);
@@ -79,7 +79,7 @@ class FileAPIMessageFilterTest : public testing::Test {
   TestBrowserThread io_browser_thread_;
 
   TestBrowserContext browser_context_;
-  scoped_refptr<fileapi::FileSystemContext> file_system_context_;
+  scoped_refptr<storage::FileSystemContext> file_system_context_;
   StreamContext* stream_context_;
   ChromeBlobStorageContext* blob_storage_context_;
 
@@ -197,7 +197,7 @@ TEST_F(FileAPIMessageFilterTest, BuildNonEmptyStream) {
   StreamHostMsg_StartBuilding start_message(kUrl, kFakeContentType);
   EXPECT_TRUE(filter_->OnMessageReceived(start_message));
 
-  webkit_blob::BlobData::Item item;
+  storage::BlobData::Item item;
   const std::string kFakeData = "foobarbaz";
   item.SetToBytes(kFakeData.data(), kFakeData.size());
   StreamHostMsg_AppendBlobDataItem append_message(kUrl, item);