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

content/browser/storage_partition_impl_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/file_util.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/run_loop.h"
 #include "base/threading/thread.h"
 #include "content/browser/browser_thread_impl.h"
 #include "content/browser/gpu/shader_disk_cache.h"
@@ skipping 31 matching lines @@
 
 const base::FilePath::CharType kDomStorageOrigin1[] =
     FILE_PATH_LITERAL("http_host1_1.localstorage");
 
 const base::FilePath::CharType kDomStorageOrigin2[] =
     FILE_PATH_LITERAL("http_host2_1.localstorage");
 
 const base::FilePath::CharType kDomStorageOrigin3[] =
     FILE_PATH_LITERAL("http_host3_1.localstorage");
 
-const quota::StorageType kTemporary = quota::kStorageTypeTemporary;
-const quota::StorageType kPersistent = quota::kStorageTypePersistent;
+const storage::StorageType kTemporary = storage::kStorageTypeTemporary;
+const storage::StorageType kPersistent = storage::kStorageTypePersistent;
 
-const quota::QuotaClient::ID kClientFile = quota::QuotaClient::kFileSystem;
+const storage::QuotaClient::ID kClientFile = storage::QuotaClient::kFileSystem;
 
 const uint32 kAllQuotaRemoveMask =
     StoragePartition::REMOVE_DATA_MASK_APPCACHE |
     StoragePartition::REMOVE_DATA_MASK_FILE_SYSTEMS |
     StoragePartition::REMOVE_DATA_MASK_INDEXEDDB |
     StoragePartition::REMOVE_DATA_MASK_WEBSQL;
 
 class AwaitCompletionHelper {
  public:
   AwaitCompletionHelper() : start_(false), already_quit_(false) {}
@@ skipping 152 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(RemoveLocalStorageTester);
 };
 
 bool IsWebSafeSchemeForTest(const std::string& scheme) {
   return scheme == "http";
 }
 
 bool DoesOriginMatchForUnprotectedWeb(
     const GURL& origin,
-    quota::SpecialStoragePolicy* special_storage_policy) {
+    storage::SpecialStoragePolicy* special_storage_policy) {
   if (IsWebSafeSchemeForTest(origin.scheme()))
     return !special_storage_policy->IsStorageProtected(origin.GetOrigin());
 
   return false;
 }
 
 bool DoesOriginMatchForBothProtectedAndUnprotectedWeb(
     const GURL& origin,
-    quota::SpecialStoragePolicy* special_storage_policy) {
+    storage::SpecialStoragePolicy* special_storage_policy) {
   return true;
 }
 
 bool DoesOriginMatchUnprotected(
     const GURL& origin,
-    quota::SpecialStoragePolicy* special_storage_policy) {
+    storage::SpecialStoragePolicy* special_storage_policy) {
   return origin.GetOrigin().scheme() != kOriginDevTools.scheme();
 }
 
 void ClearQuotaData(content::StoragePartition* partition,
                     base::RunLoop* loop_to_quit) {
   partition->ClearData(kAllQuotaRemoveMask,
                        StoragePartition::QUOTA_MANAGED_STORAGE_MASK_ALL, GURL(),
                        StoragePartition::OriginMatcherFunction(), base::Time(),
                        base::Time::Max(), loop_to_quit->QuitClosure());
 }
@@ skipping 152 matching lines @@
   base::MessageLoop::current()->PostTask(
       FROM_HERE, base::Bind(
           &ClearData,
           BrowserContext::GetDefaultStoragePartition(browser_context()),
           &run_loop));
   run_loop.Run();
   EXPECT_EQ(0u, Size());
 }
 
 TEST_F(StoragePartitionImplTest, QuotaClientMaskGeneration) {
-  EXPECT_EQ(quota::QuotaClient::kFileSystem,
+  EXPECT_EQ(storage::QuotaClient::kFileSystem,
             StoragePartitionImpl::GenerateQuotaClientMask(
                 StoragePartition::REMOVE_DATA_MASK_FILE_SYSTEMS));
-  EXPECT_EQ(quota::QuotaClient::kDatabase,
+  EXPECT_EQ(storage::QuotaClient::kDatabase,
             StoragePartitionImpl::GenerateQuotaClientMask(
                 StoragePartition::REMOVE_DATA_MASK_WEBSQL));
-  EXPECT_EQ(quota::QuotaClient::kAppcache,
+  EXPECT_EQ(storage::QuotaClient::kAppcache,
             StoragePartitionImpl::GenerateQuotaClientMask(
                 StoragePartition::REMOVE_DATA_MASK_APPCACHE));
-  EXPECT_EQ(quota::QuotaClient::kIndexedDatabase,
+  EXPECT_EQ(storage::QuotaClient::kIndexedDatabase,
             StoragePartitionImpl::GenerateQuotaClientMask(
                 StoragePartition::REMOVE_DATA_MASK_INDEXEDDB));
-  EXPECT_EQ(quota::QuotaClient::kFileSystem |
-            quota::QuotaClient::kDatabase |
-            quota::QuotaClient::kAppcache |
-            quota::QuotaClient::kIndexedDatabase,
+  EXPECT_EQ(storage::QuotaClient::kFileSystem |
+                storage::QuotaClient::kDatabase |
+                storage::QuotaClient::kAppcache |
+                storage::QuotaClient::kIndexedDatabase,
             StoragePartitionImpl::GenerateQuotaClientMask(kAllQuotaRemoveMask));
 }
 
 void PopulateTestQuotaManagedPersistentData(MockQuotaManager* manager) {
   manager->AddOrigin(kOrigin2, kPersistent, kClientFile, base::Time());
   manager->AddOrigin(kOrigin3, kPersistent, kClientFile,
       base::Time::Now() - base::TimeDelta::FromDays(1));
 
   EXPECT_FALSE(manager->OriginHasData(kOrigin1, kPersistent, kClientFile));
   EXPECT_TRUE(manager->OriginHasData(kOrigin2, kPersistent, kClientFile));
@@ skipping 479 matching lines @@
                  &run_loop));
   run_loop.Run();
 
   // kOrigin1 and kOrigin2 do not have age more than a week.
   EXPECT_FALSE(tester.DOMStorageExistsForOrigin(kOrigin1));
   EXPECT_FALSE(tester.DOMStorageExistsForOrigin(kOrigin2));
   EXPECT_TRUE(tester.DOMStorageExistsForOrigin(kOrigin3));
 }
 
 }  // namespace content