Cache Storage API: Hook up to chrome://settings/cookies

chrome/browser/browsing_data/browsing_data_remover_unittest.cc

 // Copyright (c) 2012 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 "chrome/browser/browsing_data/browsing_data_remover.h"
 
 #include <set>
 #include <string>
 #include <vector>
 
@@ skipping 150 matching lines @@
   }
   storage::QuotaManager* GetQuotaManager() override { return NULL; }
   content::AppCacheService* GetAppCacheService() override { return NULL; }
   storage::FileSystemContext* GetFileSystemContext() override { return NULL; }
   storage::DatabaseTracker* GetDatabaseTracker() override { return NULL; }
   content::DOMStorageContext* GetDOMStorageContext() override { return NULL; }
   content::IndexedDBContext* GetIndexedDBContext() override { return NULL; }
   content::ServiceWorkerContext* GetServiceWorkerContext() override {
     return NULL;
   }
+  content::CacheStorageContext* GetCacheStorageContext() override {
+    return NULL;
+  }
   content::GeofencingManager* GetGeofencingManager() override { return NULL; }
   content::NavigatorConnectContext* GetNavigatorConnectContext() override {
     return nullptr;
   }
 
   content::PlatformNotificationContext* GetPlatformNotificationContext()
       override {
     return nullptr;
   }
 
@@ skipping 1212 matching lines @@
   favicon_tester.VisitAndAddFavicon(bookmarked_page);
   ASSERT_TRUE(favicon_tester.HasFaviconForPageURL(bookmarked_page));
 
   BlockUntilBrowsingDataRemoved(BrowsingDataRemover::EVERYTHING,
                                 BrowsingDataRemover::REMOVE_HISTORY, false);
   EXPECT_EQ(BrowsingDataRemover::REMOVE_HISTORY, GetRemovalMask());
   EXPECT_TRUE(favicon_tester.HasExpiredFaviconForPageURL(bookmarked_page));
 }
 
 TEST_F(BrowsingDataRemoverTest, RemoveQuotaManagedDataForeverBoth) {
-  BlockUntilBrowsingDataRemoved(BrowsingDataRemover::EVERYTHING,
-                                BrowsingDataRemover::REMOVE_FILE_SYSTEMS |
-                                BrowsingDataRemover::REMOVE_WEBSQL |
-                                BrowsingDataRemover::REMOVE_APPCACHE |
-                                BrowsingDataRemover::REMOVE_SERVICE_WORKERS |
-                                BrowsingDataRemover::REMOVE_INDEXEDDB,
-                                false);
+  BlockUntilBrowsingDataRemoved(
+      BrowsingDataRemover::EVERYTHING,
+      BrowsingDataRemover::REMOVE_FILE_SYSTEMS |
+          BrowsingDataRemover::REMOVE_WEBSQL |
+          BrowsingDataRemover::REMOVE_APPCACHE |
+          BrowsingDataRemover::REMOVE_SERVICE_WORKERS |
+          BrowsingDataRemover::REMOVE_CACHE_STORAGE |
+          BrowsingDataRemover::REMOVE_INDEXEDDB,
+      false);
 
   EXPECT_EQ(BrowsingDataRemover::REMOVE_FILE_SYSTEMS |
-      BrowsingDataRemover::REMOVE_WEBSQL |
-      BrowsingDataRemover::REMOVE_APPCACHE |
-      BrowsingDataRemover::REMOVE_SERVICE_WORKERS |
-      BrowsingDataRemover::REMOVE_INDEXEDDB, GetRemovalMask());
+                BrowsingDataRemover::REMOVE_WEBSQL |
+                BrowsingDataRemover::REMOVE_APPCACHE |
+                BrowsingDataRemover::REMOVE_SERVICE_WORKERS |
+                BrowsingDataRemover::REMOVE_CACHE_STORAGE |
+                BrowsingDataRemover::REMOVE_INDEXEDDB,
+            GetRemovalMask());
   EXPECT_EQ(BrowsingDataHelper::UNPROTECTED_WEB, GetOriginTypeMask());
 
   // Verify storage partition related stuffs.
   StoragePartitionRemovalData removal_data = GetStoragePartitionRemovalData();
   EXPECT_EQ(removal_data.remove_mask,
             StoragePartition::REMOVE_DATA_MASK_FILE_SYSTEMS |
                 StoragePartition::REMOVE_DATA_MASK_WEBSQL |
                 StoragePartition::REMOVE_DATA_MASK_APPCACHE |
                 StoragePartition::REMOVE_DATA_MASK_SERVICE_WORKERS |
+                StoragePartition::REMOVE_DATA_MASK_CACHE_STORAGE |
                 StoragePartition::REMOVE_DATA_MASK_INDEXEDDB);
   EXPECT_EQ(removal_data.quota_storage_remove_mask,
             StoragePartition::QUOTA_MANAGED_STORAGE_MASK_ALL);
   EXPECT_TRUE(removal_data.remove_origin.is_empty());
 }
 
 TEST_F(BrowsingDataRemoverTest, RemoveQuotaManagedDataForeverOnlyTemporary) {
 #if defined(ENABLE_EXTENSIONS)
   CreateMockPolicy();
 #endif
 
-  BlockUntilBrowsingDataRemoved(BrowsingDataRemover::EVERYTHING,
-                                BrowsingDataRemover::REMOVE_FILE_SYSTEMS |
-                                BrowsingDataRemover::REMOVE_WEBSQL |
-                                BrowsingDataRemover::REMOVE_APPCACHE |
-                                BrowsingDataRemover::REMOVE_SERVICE_WORKERS |
-                                BrowsingDataRemover::REMOVE_INDEXEDDB,
-                                false);
+  BlockUntilBrowsingDataRemoved(
+      BrowsingDataRemover::EVERYTHING,
+      BrowsingDataRemover::REMOVE_FILE_SYSTEMS |
+          BrowsingDataRemover::REMOVE_WEBSQL |
+          BrowsingDataRemover::REMOVE_APPCACHE |
+          BrowsingDataRemover::REMOVE_SERVICE_WORKERS |
+          BrowsingDataRemover::REMOVE_CACHE_STORAGE |
+          BrowsingDataRemover::REMOVE_INDEXEDDB,
+      false);
 
   EXPECT_EQ(BrowsingDataRemover::REMOVE_FILE_SYSTEMS |
-      BrowsingDataRemover::REMOVE_WEBSQL |
-      BrowsingDataRemover::REMOVE_APPCACHE |
-      BrowsingDataRemover::REMOVE_SERVICE_WORKERS |
-      BrowsingDataRemover::REMOVE_INDEXEDDB, GetRemovalMask());
+                BrowsingDataRemover::REMOVE_WEBSQL |
+                BrowsingDataRemover::REMOVE_APPCACHE |
+                BrowsingDataRemover::REMOVE_SERVICE_WORKERS |
+                BrowsingDataRemover::REMOVE_CACHE_STORAGE |
+                BrowsingDataRemover::REMOVE_INDEXEDDB,
+            GetRemovalMask());
   EXPECT_EQ(BrowsingDataHelper::UNPROTECTED_WEB, GetOriginTypeMask());
 
   // Verify storage partition related stuffs.
   StoragePartitionRemovalData removal_data = GetStoragePartitionRemovalData();
 
   EXPECT_EQ(removal_data.remove_mask,
             StoragePartition::REMOVE_DATA_MASK_FILE_SYSTEMS |
                 StoragePartition::REMOVE_DATA_MASK_WEBSQL |
                 StoragePartition::REMOVE_DATA_MASK_APPCACHE |
                 StoragePartition::REMOVE_DATA_MASK_SERVICE_WORKERS |
+                StoragePartition::REMOVE_DATA_MASK_CACHE_STORAGE |
                 StoragePartition::REMOVE_DATA_MASK_INDEXEDDB);
   EXPECT_EQ(removal_data.quota_storage_remove_mask,
             StoragePartition::QUOTA_MANAGED_STORAGE_MASK_ALL);
   EXPECT_TRUE(removal_data.remove_origin.is_empty());
 
   // Check that all related origin data would be removed, that is, origin
   // matcher would match these origin.
   EXPECT_TRUE(removal_data.origin_matcher.Run(kOrigin1, mock_policy()));
   EXPECT_TRUE(removal_data.origin_matcher.Run(kOrigin2, mock_policy()));
   EXPECT_TRUE(removal_data.origin_matcher.Run(kOrigin3, mock_policy()));
 }
 
 TEST_F(BrowsingDataRemoverTest, RemoveQuotaManagedDataForeverOnlyPersistent) {
 #if defined(ENABLE_EXTENSIONS)
   CreateMockPolicy();
 #endif
 
-  BlockUntilBrowsingDataRemoved(BrowsingDataRemover::EVERYTHING,
-                                BrowsingDataRemover::REMOVE_FILE_SYSTEMS |
-                                BrowsingDataRemover::REMOVE_WEBSQL |
-                                BrowsingDataRemover::REMOVE_APPCACHE |
-                                BrowsingDataRemover::REMOVE_SERVICE_WORKERS |
-                                BrowsingDataRemover::REMOVE_INDEXEDDB,
-                                false);
+  BlockUntilBrowsingDataRemoved(
+      BrowsingDataRemover::EVERYTHING,
+      BrowsingDataRemover::REMOVE_FILE_SYSTEMS |
+          BrowsingDataRemover::REMOVE_WEBSQL |
+          BrowsingDataRemover::REMOVE_APPCACHE |
+          BrowsingDataRemover::REMOVE_SERVICE_WORKERS |
+          BrowsingDataRemover::REMOVE_CACHE_STORAGE |
+          BrowsingDataRemover::REMOVE_INDEXEDDB,
+      false);
 
   EXPECT_EQ(BrowsingDataRemover::REMOVE_FILE_SYSTEMS |
-      BrowsingDataRemover::REMOVE_WEBSQL |
-      BrowsingDataRemover::REMOVE_APPCACHE |
-      BrowsingDataRemover::REMOVE_SERVICE_WORKERS |
-      BrowsingDataRemover::REMOVE_INDEXEDDB, GetRemovalMask());
+                BrowsingDataRemover::REMOVE_WEBSQL |
+                BrowsingDataRemover::REMOVE_APPCACHE |
+                BrowsingDataRemover::REMOVE_SERVICE_WORKERS |
+                BrowsingDataRemover::REMOVE_CACHE_STORAGE |
+                BrowsingDataRemover::REMOVE_INDEXEDDB,
+            GetRemovalMask());
   EXPECT_EQ(BrowsingDataHelper::UNPROTECTED_WEB, GetOriginTypeMask());
 
   // Verify storage partition related stuffs.
   StoragePartitionRemovalData removal_data = GetStoragePartitionRemovalData();
 
   EXPECT_EQ(removal_data.remove_mask,
             StoragePartition::REMOVE_DATA_MASK_FILE_SYSTEMS |
                 StoragePartition::REMOVE_DATA_MASK_WEBSQL |
                 StoragePartition::REMOVE_DATA_MASK_APPCACHE |
                 StoragePartition::REMOVE_DATA_MASK_SERVICE_WORKERS |
+                StoragePartition::REMOVE_DATA_MASK_CACHE_STORAGE |
                 StoragePartition::REMOVE_DATA_MASK_INDEXEDDB);
   EXPECT_EQ(removal_data.quota_storage_remove_mask,
             StoragePartition::QUOTA_MANAGED_STORAGE_MASK_ALL);
   EXPECT_TRUE(removal_data.remove_origin.is_empty());
 
   // Check that all related origin data would be removed, that is, origin
   // matcher would match these origin.
   EXPECT_TRUE(removal_data.origin_matcher.Run(kOrigin1, mock_policy()));
   EXPECT_TRUE(removal_data.origin_matcher.Run(kOrigin2, mock_policy()));
   EXPECT_TRUE(removal_data.origin_matcher.Run(kOrigin3, mock_policy()));
 }
 
 TEST_F(BrowsingDataRemoverTest, RemoveQuotaManagedDataForeverNeither) {
 #if defined(ENABLE_EXTENSIONS)
   CreateMockPolicy();
 #endif
 
-
-  BlockUntilBrowsingDataRemoved(BrowsingDataRemover::EVERYTHING,
-                                BrowsingDataRemover::REMOVE_FILE_SYSTEMS |
-                                BrowsingDataRemover::REMOVE_WEBSQL |
-                                BrowsingDataRemover::REMOVE_APPCACHE |
-                                BrowsingDataRemover::REMOVE_SERVICE_WORKERS |
-                                BrowsingDataRemover::REMOVE_INDEXEDDB,
-                                false);
+  BlockUntilBrowsingDataRemoved(
+      BrowsingDataRemover::EVERYTHING,
+      BrowsingDataRemover::REMOVE_FILE_SYSTEMS |
+          BrowsingDataRemover::REMOVE_WEBSQL |
+          BrowsingDataRemover::REMOVE_APPCACHE |
+          BrowsingDataRemover::REMOVE_SERVICE_WORKERS |
+          BrowsingDataRemover::REMOVE_CACHE_STORAGE |
+          BrowsingDataRemover::REMOVE_INDEXEDDB,
+      false);
 
   EXPECT_EQ(BrowsingDataRemover::REMOVE_FILE_SYSTEMS |
-      BrowsingDataRemover::REMOVE_WEBSQL |
-      BrowsingDataRemover::REMOVE_APPCACHE |
-      BrowsingDataRemover::REMOVE_SERVICE_WORKERS |
-      BrowsingDataRemover::REMOVE_INDEXEDDB, GetRemovalMask());
+                BrowsingDataRemover::REMOVE_WEBSQL |
+                BrowsingDataRemover::REMOVE_APPCACHE |
+                BrowsingDataRemover::REMOVE_SERVICE_WORKERS |
+                BrowsingDataRemover::REMOVE_CACHE_STORAGE |
+                BrowsingDataRemover::REMOVE_INDEXEDDB,
+            GetRemovalMask());
   EXPECT_EQ(BrowsingDataHelper::UNPROTECTED_WEB, GetOriginTypeMask());
 
   // Verify storage partition related stuffs.
   StoragePartitionRemovalData removal_data = GetStoragePartitionRemovalData();
 
   EXPECT_EQ(removal_data.remove_mask,
             StoragePartition::REMOVE_DATA_MASK_FILE_SYSTEMS |
                 StoragePartition::REMOVE_DATA_MASK_WEBSQL |
                 StoragePartition::REMOVE_DATA_MASK_APPCACHE |
                 StoragePartition::REMOVE_DATA_MASK_SERVICE_WORKERS |
+                StoragePartition::REMOVE_DATA_MASK_CACHE_STORAGE |
                 StoragePartition::REMOVE_DATA_MASK_INDEXEDDB);
   EXPECT_EQ(removal_data.quota_storage_remove_mask,
             StoragePartition::QUOTA_MANAGED_STORAGE_MASK_ALL);
   EXPECT_TRUE(removal_data.remove_origin.is_empty());
 
   // Check that all related origin data would be removed, that is, origin
   // matcher would match these origin.
   EXPECT_TRUE(removal_data.origin_matcher.Run(kOrigin1, mock_policy()));
   EXPECT_TRUE(removal_data.origin_matcher.Run(kOrigin2, mock_policy()));
   EXPECT_TRUE(removal_data.origin_matcher.Run(kOrigin3, mock_policy()));
 }
 
 TEST_F(BrowsingDataRemoverTest, RemoveQuotaManagedDataForeverSpecificOrigin) {
   // Remove Origin 1.
   BlockUntilOriginDataRemoved(BrowsingDataRemover::EVERYTHING,
                               BrowsingDataRemover::REMOVE_APPCACHE |
-                              BrowsingDataRemover::REMOVE_SERVICE_WORKERS |
-                              BrowsingDataRemover::REMOVE_FILE_SYSTEMS |
-                              BrowsingDataRemover::REMOVE_INDEXEDDB |
-                              BrowsingDataRemover::REMOVE_WEBSQL,
+                                  BrowsingDataRemover::REMOVE_SERVICE_WORKERS |
+                                  BrowsingDataRemover::REMOVE_CACHE_STORAGE |
+                                  BrowsingDataRemover::REMOVE_FILE_SYSTEMS |
+                                  BrowsingDataRemover::REMOVE_INDEXEDDB |
+                                  BrowsingDataRemover::REMOVE_WEBSQL,
                               kOrigin1);
 
   EXPECT_EQ(BrowsingDataRemover::REMOVE_APPCACHE |
-      BrowsingDataRemover::REMOVE_SERVICE_WORKERS |
-      BrowsingDataRemover::REMOVE_FILE_SYSTEMS |
-      BrowsingDataRemover::REMOVE_INDEXEDDB |
-      BrowsingDataRemover::REMOVE_WEBSQL, GetRemovalMask());
+                BrowsingDataRemover::REMOVE_SERVICE_WORKERS |
+                BrowsingDataRemover::REMOVE_CACHE_STORAGE |
+                BrowsingDataRemover::REMOVE_FILE_SYSTEMS |
+                BrowsingDataRemover::REMOVE_INDEXEDDB |
+                BrowsingDataRemover::REMOVE_WEBSQL,
+            GetRemovalMask());
   EXPECT_EQ(BrowsingDataHelper::UNPROTECTED_WEB, GetOriginTypeMask());
 
   // Verify storage partition related stuffs.
   StoragePartitionRemovalData removal_data = GetStoragePartitionRemovalData();
 
   EXPECT_EQ(removal_data.remove_mask,
             StoragePartition::REMOVE_DATA_MASK_FILE_SYSTEMS |
                 StoragePartition::REMOVE_DATA_MASK_WEBSQL |
                 StoragePartition::REMOVE_DATA_MASK_APPCACHE |
                 StoragePartition::REMOVE_DATA_MASK_SERVICE_WORKERS |
+                StoragePartition::REMOVE_DATA_MASK_CACHE_STORAGE |
                 StoragePartition::REMOVE_DATA_MASK_INDEXEDDB);
   EXPECT_EQ(removal_data.quota_storage_remove_mask,
             StoragePartition::QUOTA_MANAGED_STORAGE_MASK_ALL);
   EXPECT_EQ(removal_data.remove_origin, kOrigin1);
 }
 
 TEST_F(BrowsingDataRemoverTest, RemoveQuotaManagedDataForLastHour) {
-  BlockUntilBrowsingDataRemoved(BrowsingDataRemover::LAST_HOUR,
-                                BrowsingDataRemover::REMOVE_FILE_SYSTEMS |
-                                BrowsingDataRemover::REMOVE_WEBSQL |
-                                BrowsingDataRemover::REMOVE_APPCACHE |
-                                BrowsingDataRemover::REMOVE_SERVICE_WORKERS |
-                                BrowsingDataRemover::REMOVE_INDEXEDDB,
-                                false);
+  BlockUntilBrowsingDataRemoved(
+      BrowsingDataRemover::LAST_HOUR,
+      BrowsingDataRemover::REMOVE_FILE_SYSTEMS |
+          BrowsingDataRemover::REMOVE_WEBSQL |
+          BrowsingDataRemover::REMOVE_APPCACHE |
+          BrowsingDataRemover::REMOVE_SERVICE_WORKERS |
+          BrowsingDataRemover::REMOVE_CACHE_STORAGE |
+          BrowsingDataRemover::REMOVE_INDEXEDDB,
+      false);
 
   EXPECT_EQ(BrowsingDataRemover::REMOVE_FILE_SYSTEMS |
-      BrowsingDataRemover::REMOVE_WEBSQL |
-      BrowsingDataRemover::REMOVE_APPCACHE |
-      BrowsingDataRemover::REMOVE_SERVICE_WORKERS |
-      BrowsingDataRemover::REMOVE_INDEXEDDB, GetRemovalMask());
+                BrowsingDataRemover::REMOVE_WEBSQL |
+                BrowsingDataRemover::REMOVE_APPCACHE |
+                BrowsingDataRemover::REMOVE_SERVICE_WORKERS |
+                BrowsingDataRemover::REMOVE_CACHE_STORAGE |
+                BrowsingDataRemover::REMOVE_INDEXEDDB,
+            GetRemovalMask());
   EXPECT_EQ(BrowsingDataHelper::UNPROTECTED_WEB, GetOriginTypeMask());
 
   // Verify storage partition related stuffs.
   StoragePartitionRemovalData removal_data = GetStoragePartitionRemovalData();
 
   EXPECT_EQ(removal_data.remove_mask,
             StoragePartition::REMOVE_DATA_MASK_FILE_SYSTEMS |
                 StoragePartition::REMOVE_DATA_MASK_WEBSQL |
                 StoragePartition::REMOVE_DATA_MASK_APPCACHE |
                 StoragePartition::REMOVE_DATA_MASK_SERVICE_WORKERS |
+                StoragePartition::REMOVE_DATA_MASK_CACHE_STORAGE |
                 StoragePartition::REMOVE_DATA_MASK_INDEXEDDB);
 
   // Persistent data would be left out since we are not removing from
   // beginning of time.
   uint32 expected_quota_mask =
       ~StoragePartition::QUOTA_MANAGED_STORAGE_MASK_PERSISTENT;
   EXPECT_EQ(removal_data.quota_storage_remove_mask, expected_quota_mask);
   EXPECT_TRUE(removal_data.remove_origin.is_empty());
   // Check removal begin time.
   EXPECT_EQ(removal_data.remove_begin, GetBeginTime());
 }
 
 TEST_F(BrowsingDataRemoverTest, RemoveQuotaManagedDataForLastWeek) {
-  BlockUntilBrowsingDataRemoved(BrowsingDataRemover::LAST_WEEK,
-                                BrowsingDataRemover::REMOVE_FILE_SYSTEMS |
-                                BrowsingDataRemover::REMOVE_WEBSQL |
-                                BrowsingDataRemover::REMOVE_APPCACHE |
-                                BrowsingDataRemover::REMOVE_SERVICE_WORKERS |
-                                BrowsingDataRemover::REMOVE_INDEXEDDB,
-                                false);
+  BlockUntilBrowsingDataRemoved(
+      BrowsingDataRemover::LAST_WEEK,
+      BrowsingDataRemover::REMOVE_FILE_SYSTEMS |
+          BrowsingDataRemover::REMOVE_WEBSQL |
+          BrowsingDataRemover::REMOVE_APPCACHE |
+          BrowsingDataRemover::REMOVE_SERVICE_WORKERS |
+          BrowsingDataRemover::REMOVE_CACHE_STORAGE |
+          BrowsingDataRemover::REMOVE_INDEXEDDB,
+      false);
 
   EXPECT_EQ(BrowsingDataRemover::REMOVE_FILE_SYSTEMS |
-      BrowsingDataRemover::REMOVE_WEBSQL |
-      BrowsingDataRemover::REMOVE_APPCACHE |
-      BrowsingDataRemover::REMOVE_SERVICE_WORKERS |
-      BrowsingDataRemover::REMOVE_INDEXEDDB, GetRemovalMask());
+                BrowsingDataRemover::REMOVE_WEBSQL |
+                BrowsingDataRemover::REMOVE_APPCACHE |
+                BrowsingDataRemover::REMOVE_SERVICE_WORKERS |
+                BrowsingDataRemover::REMOVE_CACHE_STORAGE |
+                BrowsingDataRemover::REMOVE_INDEXEDDB,
+            GetRemovalMask());
   EXPECT_EQ(BrowsingDataHelper::UNPROTECTED_WEB, GetOriginTypeMask());
 
   // Verify storage partition related stuffs.
   StoragePartitionRemovalData removal_data = GetStoragePartitionRemovalData();
 
   EXPECT_EQ(removal_data.remove_mask,
             StoragePartition::REMOVE_DATA_MASK_FILE_SYSTEMS |
                 StoragePartition::REMOVE_DATA_MASK_WEBSQL |
                 StoragePartition::REMOVE_DATA_MASK_APPCACHE |
                 StoragePartition::REMOVE_DATA_MASK_SERVICE_WORKERS |
+                StoragePartition::REMOVE_DATA_MASK_CACHE_STORAGE |
                 StoragePartition::REMOVE_DATA_MASK_INDEXEDDB);
 
   // Persistent data would be left out since we are not removing from
   // beginning of time.
   uint32 expected_quota_mask =
       ~StoragePartition::QUOTA_MANAGED_STORAGE_MASK_PERSISTENT;
   EXPECT_EQ(removal_data.quota_storage_remove_mask, expected_quota_mask);
   EXPECT_TRUE(removal_data.remove_origin.is_empty());
   // Check removal begin time.
   EXPECT_EQ(removal_data.remove_begin, GetBeginTime());
 }
 
 TEST_F(BrowsingDataRemoverTest, RemoveQuotaManagedUnprotectedOrigins) {
 #if defined(ENABLE_EXTENSIONS)
   MockExtensionSpecialStoragePolicy* policy = CreateMockPolicy();
   // Protect kOrigin1.
   policy->AddProtected(kOrigin1.GetOrigin());
 #endif
 
-  BlockUntilBrowsingDataRemoved(BrowsingDataRemover::EVERYTHING,
-                                BrowsingDataRemover::REMOVE_FILE_SYSTEMS |
-                                BrowsingDataRemover::REMOVE_WEBSQL |
-                                BrowsingDataRemover::REMOVE_APPCACHE |
-                                BrowsingDataRemover::REMOVE_SERVICE_WORKERS |
-                                BrowsingDataRemover::REMOVE_INDEXEDDB,
-                                false);
+  BlockUntilBrowsingDataRemoved(
+      BrowsingDataRemover::EVERYTHING,
+      BrowsingDataRemover::REMOVE_FILE_SYSTEMS |
+          BrowsingDataRemover::REMOVE_WEBSQL |
+          BrowsingDataRemover::REMOVE_APPCACHE |
+          BrowsingDataRemover::REMOVE_SERVICE_WORKERS |
+          BrowsingDataRemover::REMOVE_CACHE_STORAGE |
+          BrowsingDataRemover::REMOVE_INDEXEDDB,
+      false);
 
   EXPECT_EQ(BrowsingDataRemover::REMOVE_FILE_SYSTEMS |
-      BrowsingDataRemover::REMOVE_WEBSQL |
-      BrowsingDataRemover::REMOVE_APPCACHE |
-      BrowsingDataRemover::REMOVE_SERVICE_WORKERS |
-      BrowsingDataRemover::REMOVE_INDEXEDDB, GetRemovalMask());
+                BrowsingDataRemover::REMOVE_WEBSQL |
+                BrowsingDataRemover::REMOVE_APPCACHE |
+                BrowsingDataRemover::REMOVE_SERVICE_WORKERS |
+                BrowsingDataRemover::REMOVE_CACHE_STORAGE |
+                BrowsingDataRemover::REMOVE_INDEXEDDB,
+            GetRemovalMask());
   EXPECT_EQ(BrowsingDataHelper::UNPROTECTED_WEB, GetOriginTypeMask());
 
   // Verify storage partition related stuffs.
   StoragePartitionRemovalData removal_data = GetStoragePartitionRemovalData();
 
   EXPECT_EQ(removal_data.remove_mask,
             StoragePartition::REMOVE_DATA_MASK_FILE_SYSTEMS |
                 StoragePartition::REMOVE_DATA_MASK_WEBSQL |
                 StoragePartition::REMOVE_DATA_MASK_APPCACHE |
                 StoragePartition::REMOVE_DATA_MASK_SERVICE_WORKERS |
+                StoragePartition::REMOVE_DATA_MASK_CACHE_STORAGE |
                 StoragePartition::REMOVE_DATA_MASK_INDEXEDDB);
   EXPECT_EQ(removal_data.quota_storage_remove_mask,
             StoragePartition::QUOTA_MANAGED_STORAGE_MASK_ALL);
   EXPECT_TRUE(removal_data.remove_origin.is_empty());
 
   // Check OriginMatcherFunction.
   EXPECT_EQ(ShouldRemoveForProtectedOriginOne(),
             removal_data.origin_matcher.Run(kOrigin1, mock_policy()));
   EXPECT_TRUE(removal_data.origin_matcher.Run(kOrigin2, mock_policy()));
   EXPECT_TRUE(removal_data.origin_matcher.Run(kOrigin3, mock_policy()));
 }
 
 TEST_F(BrowsingDataRemoverTest, RemoveQuotaManagedProtectedSpecificOrigin) {
 #if defined(ENABLE_EXTENSIONS)
   MockExtensionSpecialStoragePolicy* policy = CreateMockPolicy();
   // Protect kOrigin1.
   policy->AddProtected(kOrigin1.GetOrigin());
 #endif
 
   // Try to remove kOrigin1. Expect failure.
   BlockUntilOriginDataRemoved(BrowsingDataRemover::EVERYTHING,
                               BrowsingDataRemover::REMOVE_APPCACHE |
-                              BrowsingDataRemover::REMOVE_SERVICE_WORKERS |
-                              BrowsingDataRemover::REMOVE_FILE_SYSTEMS |
-                              BrowsingDataRemover::REMOVE_INDEXEDDB |
-                              BrowsingDataRemover::REMOVE_WEBSQL,
+                                  BrowsingDataRemover::REMOVE_SERVICE_WORKERS |
+                                  BrowsingDataRemover::REMOVE_CACHE_STORAGE |
+                                  BrowsingDataRemover::REMOVE_FILE_SYSTEMS |
+                                  BrowsingDataRemover::REMOVE_INDEXEDDB |
+                                  BrowsingDataRemover::REMOVE_WEBSQL,
                               kOrigin1);
 
   EXPECT_EQ(BrowsingDataRemover::REMOVE_APPCACHE |
-      BrowsingDataRemover::REMOVE_SERVICE_WORKERS |
-      BrowsingDataRemover::REMOVE_FILE_SYSTEMS |
-      BrowsingDataRemover::REMOVE_INDEXEDDB |
-      BrowsingDataRemover::REMOVE_WEBSQL, GetRemovalMask());
+                BrowsingDataRemover::REMOVE_SERVICE_WORKERS |
+                BrowsingDataRemover::REMOVE_CACHE_STORAGE |
+                BrowsingDataRemover::REMOVE_FILE_SYSTEMS |
+                BrowsingDataRemover::REMOVE_INDEXEDDB |
+                BrowsingDataRemover::REMOVE_WEBSQL,
+            GetRemovalMask());
   EXPECT_EQ(BrowsingDataHelper::UNPROTECTED_WEB, GetOriginTypeMask());
 
   // Verify storage partition related stuffs.
   StoragePartitionRemovalData removal_data = GetStoragePartitionRemovalData();
 
   EXPECT_EQ(removal_data.remove_mask,
             StoragePartition::REMOVE_DATA_MASK_FILE_SYSTEMS |
                 StoragePartition::REMOVE_DATA_MASK_WEBSQL |
                 StoragePartition::REMOVE_DATA_MASK_APPCACHE |
                 StoragePartition::REMOVE_DATA_MASK_SERVICE_WORKERS |
+                StoragePartition::REMOVE_DATA_MASK_CACHE_STORAGE |
                 StoragePartition::REMOVE_DATA_MASK_INDEXEDDB);
   EXPECT_EQ(removal_data.quota_storage_remove_mask,
             StoragePartition::QUOTA_MANAGED_STORAGE_MASK_ALL);
   EXPECT_EQ(removal_data.remove_origin, kOrigin1);
 
   // Check OriginMatcherFunction.
   EXPECT_EQ(ShouldRemoveForProtectedOriginOne(),
             removal_data.origin_matcher.Run(kOrigin1, mock_policy()));
   EXPECT_TRUE(removal_data.origin_matcher.Run(kOrigin2, mock_policy()));
   EXPECT_TRUE(removal_data.origin_matcher.Run(kOrigin3, mock_policy()));
 }
 
 TEST_F(BrowsingDataRemoverTest, RemoveQuotaManagedProtectedOrigins) {
 #if defined(ENABLE_EXTENSIONS)
   MockExtensionSpecialStoragePolicy* policy = CreateMockPolicy();
   // Protect kOrigin1.
   policy->AddProtected(kOrigin1.GetOrigin());
 #endif
 
   // Try to remove kOrigin1. Expect success.
-  BlockUntilBrowsingDataRemoved(BrowsingDataRemover::EVERYTHING,
-                                BrowsingDataRemover::REMOVE_APPCACHE |
-                                BrowsingDataRemover::REMOVE_SERVICE_WORKERS |
-                                BrowsingDataRemover::REMOVE_FILE_SYSTEMS |
-                                BrowsingDataRemover::REMOVE_INDEXEDDB |
-                                BrowsingDataRemover::REMOVE_WEBSQL,
-                                true);
+  BlockUntilBrowsingDataRemoved(
+      BrowsingDataRemover::EVERYTHING,
+      BrowsingDataRemover::REMOVE_APPCACHE |
+          BrowsingDataRemover::REMOVE_SERVICE_WORKERS |
+          BrowsingDataRemover::REMOVE_CACHE_STORAGE |
+          BrowsingDataRemover::REMOVE_FILE_SYSTEMS |
+          BrowsingDataRemover::REMOVE_INDEXEDDB |
+          BrowsingDataRemover::REMOVE_WEBSQL,
+      true);
 
   EXPECT_EQ(BrowsingDataRemover::REMOVE_APPCACHE |
-      BrowsingDataRemover::REMOVE_SERVICE_WORKERS |
-      BrowsingDataRemover::REMOVE_FILE_SYSTEMS |
-      BrowsingDataRemover::REMOVE_INDEXEDDB |
-      BrowsingDataRemover::REMOVE_WEBSQL, GetRemovalMask());
+                BrowsingDataRemover::REMOVE_SERVICE_WORKERS |
+                BrowsingDataRemover::REMOVE_CACHE_STORAGE |
+                BrowsingDataRemover::REMOVE_FILE_SYSTEMS |
+                BrowsingDataRemover::REMOVE_INDEXEDDB |
+                BrowsingDataRemover::REMOVE_WEBSQL,
+            GetRemovalMask());
   EXPECT_EQ(BrowsingDataHelper::PROTECTED_WEB |
       BrowsingDataHelper::UNPROTECTED_WEB, GetOriginTypeMask());
 
   // Verify storage partition related stuffs.
   StoragePartitionRemovalData removal_data = GetStoragePartitionRemovalData();
 
   EXPECT_EQ(removal_data.remove_mask,
             StoragePartition::REMOVE_DATA_MASK_FILE_SYSTEMS |
                 StoragePartition::REMOVE_DATA_MASK_WEBSQL |
                 StoragePartition::REMOVE_DATA_MASK_APPCACHE |
                 StoragePartition::REMOVE_DATA_MASK_SERVICE_WORKERS |
+                StoragePartition::REMOVE_DATA_MASK_CACHE_STORAGE |
                 StoragePartition::REMOVE_DATA_MASK_INDEXEDDB);
   EXPECT_EQ(removal_data.quota_storage_remove_mask,
             StoragePartition::QUOTA_MANAGED_STORAGE_MASK_ALL);
   EXPECT_TRUE(removal_data.remove_origin.is_empty());
 
   // Check OriginMatcherFunction, |kOrigin1| would match mask since we
   // would have 'protected' specified in origin_type_mask.
   EXPECT_TRUE(removal_data.origin_matcher.Run(kOrigin1, mock_policy()));
   EXPECT_TRUE(removal_data.origin_matcher.Run(kOrigin2, mock_policy()));
   EXPECT_TRUE(removal_data.origin_matcher.Run(kOrigin3, mock_policy()));
 }
 
 TEST_F(BrowsingDataRemoverTest, RemoveQuotaManagedIgnoreExtensionsAndDevTools) {
 #if defined(ENABLE_EXTENSIONS)
   CreateMockPolicy();
 #endif
 
-  BlockUntilBrowsingDataRemoved(BrowsingDataRemover::EVERYTHING,
-                                BrowsingDataRemover::REMOVE_APPCACHE |
-                                BrowsingDataRemover::REMOVE_SERVICE_WORKERS |
-                                BrowsingDataRemover::REMOVE_FILE_SYSTEMS |
-                                BrowsingDataRemover::REMOVE_INDEXEDDB |
-                                BrowsingDataRemover::REMOVE_WEBSQL,
-                                false);
+  BlockUntilBrowsingDataRemoved(
+      BrowsingDataRemover::EVERYTHING,
+      BrowsingDataRemover::REMOVE_APPCACHE |
+          BrowsingDataRemover::REMOVE_SERVICE_WORKERS |
+          BrowsingDataRemover::REMOVE_CACHE_STORAGE |
+          BrowsingDataRemover::REMOVE_FILE_SYSTEMS |
+          BrowsingDataRemover::REMOVE_INDEXEDDB |
+          BrowsingDataRemover::REMOVE_WEBSQL,
+      false);
 
   EXPECT_EQ(BrowsingDataRemover::REMOVE_APPCACHE |
-      BrowsingDataRemover::REMOVE_SERVICE_WORKERS |
-      BrowsingDataRemover::REMOVE_FILE_SYSTEMS |
-      BrowsingDataRemover::REMOVE_INDEXEDDB |
-      BrowsingDataRemover::REMOVE_WEBSQL, GetRemovalMask());
+                BrowsingDataRemover::REMOVE_SERVICE_WORKERS |
+                BrowsingDataRemover::REMOVE_CACHE_STORAGE |
+                BrowsingDataRemover::REMOVE_FILE_SYSTEMS |
+                BrowsingDataRemover::REMOVE_INDEXEDDB |
+                BrowsingDataRemover::REMOVE_WEBSQL,
+            GetRemovalMask());
   EXPECT_EQ(BrowsingDataHelper::UNPROTECTED_WEB, GetOriginTypeMask());
 
   // Verify storage partition related stuffs.
   StoragePartitionRemovalData removal_data = GetStoragePartitionRemovalData();
 
   EXPECT_EQ(removal_data.remove_mask,
             StoragePartition::REMOVE_DATA_MASK_FILE_SYSTEMS |
                 StoragePartition::REMOVE_DATA_MASK_WEBSQL |
                 StoragePartition::REMOVE_DATA_MASK_APPCACHE |
                 StoragePartition::REMOVE_DATA_MASK_SERVICE_WORKERS |
+                StoragePartition::REMOVE_DATA_MASK_CACHE_STORAGE |
                 StoragePartition::REMOVE_DATA_MASK_INDEXEDDB);
   EXPECT_EQ(removal_data.quota_storage_remove_mask,
             StoragePartition::QUOTA_MANAGED_STORAGE_MASK_ALL);
   EXPECT_TRUE(removal_data.remove_origin.is_empty());
 
   // Check that extension and devtools data wouldn't be removed, that is,
   // origin matcher would not match these origin.
   EXPECT_FALSE(removal_data.origin_matcher.Run(kOriginExt, mock_policy()));
   EXPECT_FALSE(removal_data.origin_matcher.Run(kOriginDevTools, mock_policy()));
 }
@@ skipping 238 matching lines @@
 TEST_F(BrowsingDataRemoverTest, RemoveSameOriginDownloads) {
   RemoveDownloadsTester tester(GetProfile());
   const url::Origin expectedOrigin(kOrigin1);
 
   EXPECT_CALL(*tester.download_manager(),
               RemoveDownloadsByOriginAndTime(SameOrigin(expectedOrigin), _, _));
 
   BlockUntilOriginDataRemoved(BrowsingDataRemover::EVERYTHING,
                               BrowsingDataRemover::REMOVE_DOWNLOADS, kOrigin1);
 }