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

chrome/browser/extensions/api/browsing_data/browsing_data_test.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 <string>
 
 #include "base/json/json_string_value_serializer.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_service.h"
@@ skipping 14 matching lines @@
 using extension_function_test_utils::RunFunctionAndReturnSingleResult;
 
 namespace {
 
 enum OriginTypeMask {
   UNPROTECTED_WEB = BrowsingDataHelper::UNPROTECTED_WEB,
   PROTECTED_WEB = BrowsingDataHelper::PROTECTED_WEB,
   EXTENSION = BrowsingDataHelper::EXTENSION
 };
 
-const char kRemoveEverythingArguments[] = "[{\"since\": 1000}, {"
+const char kRemoveEverythingArguments[] =
+    "[{\"since\": 1000}, {"
     "\"appcache\": true, \"cache\": true, \"cookies\": true, "
     "\"downloads\": true, \"fileSystems\": true, \"formData\": true, "
     "\"history\": true, \"indexedDB\": true, \"localStorage\": true, "
     "\"serverBoundCertificates\": true, \"passwords\": true, "
-    "\"pluginData\": true, \"serviceWorkers\": true, \"webSQL\": true"
+    "\"pluginData\": true, \"serviceWorkers\": true, \"cacheStorage\": true, "
+    "\"webSQL\": true"
     "}]";
 
-
 class ExtensionBrowsingDataTest : public InProcessBrowserTest {
  public:
   base::Time GetBeginTime() {
     return called_with_details_->removal_begin;
   }
 
   int GetRemovalMask() {
     return called_with_details_->removal_mask;
   }
 
@@ skipping 141 matching lines @@
     EXPECT_TRUE(options->GetDictionary("originTypes", &origin_types));
     int origin_type_mask = GetAsMask(origin_types, "unprotectedWeb",
                                     UNPROTECTED_WEB) |
                           GetAsMask(origin_types, "protectedWeb",
                                     PROTECTED_WEB) |
                           GetAsMask(origin_types, "extension", EXTENSION);
     EXPECT_EQ(expected_origin_type_mask, origin_type_mask);
 
     base::DictionaryValue* data_to_remove;
     EXPECT_TRUE(result->GetDictionary("dataToRemove", &data_to_remove));
-    int removal_mask = GetAsMask(data_to_remove, "appcache",
-                                 BrowsingDataRemover::REMOVE_APPCACHE) |
-                       GetAsMask(data_to_remove, "cache",
-                                 BrowsingDataRemover::REMOVE_CACHE) |
-                       GetAsMask(data_to_remove, "cookies",
-                                 BrowsingDataRemover::REMOVE_COOKIES |
-                                 BrowsingDataRemover::REMOVE_WEBRTC_IDENTITY) |
-                       GetAsMask(data_to_remove, "downloads",
-                                 BrowsingDataRemover::REMOVE_DOWNLOADS) |
-                       GetAsMask(data_to_remove, "fileSystems",
-                                 BrowsingDataRemover::REMOVE_FILE_SYSTEMS) |
-                       GetAsMask(data_to_remove, "formData",
-                                 BrowsingDataRemover::REMOVE_FORM_DATA) |
-                       GetAsMask(data_to_remove, "history",
-                                 BrowsingDataRemover::REMOVE_HISTORY) |
-                       GetAsMask(data_to_remove, "indexedDB",
-                                 BrowsingDataRemover::REMOVE_INDEXEDDB) |
-                       GetAsMask(data_to_remove, "localStorage",
-                                 BrowsingDataRemover::REMOVE_LOCAL_STORAGE) |
-                       GetAsMask(data_to_remove, "pluginData",
-                                 BrowsingDataRemover::REMOVE_PLUGIN_DATA) |
-                       GetAsMask(data_to_remove, "passwords",
-                                 BrowsingDataRemover::REMOVE_PASSWORDS) |
-                       GetAsMask(data_to_remove, "serviceWorkers",
-                                 BrowsingDataRemover::REMOVE_SERVICE_WORKERS) |
-                       GetAsMask(data_to_remove, "webSQL",
-                                 BrowsingDataRemover::REMOVE_WEBSQL) |
-                       GetAsMask(data_to_remove, "serverBoundCertificates",
-                           BrowsingDataRemover::REMOVE_CHANNEL_IDS);
+    int removal_mask =
+        GetAsMask(data_to_remove, "appcache",
+                  BrowsingDataRemover::REMOVE_APPCACHE) |
+        GetAsMask(data_to_remove, "cache", BrowsingDataRemover::REMOVE_CACHE) |
+        GetAsMask(data_to_remove, "cookies",
+                  BrowsingDataRemover::REMOVE_COOKIES |
+                      BrowsingDataRemover::REMOVE_WEBRTC_IDENTITY) |
+        GetAsMask(data_to_remove, "downloads",
+                  BrowsingDataRemover::REMOVE_DOWNLOADS) |
+        GetAsMask(data_to_remove, "fileSystems",
+                  BrowsingDataRemover::REMOVE_FILE_SYSTEMS) |
+        GetAsMask(data_to_remove, "formData",
+                  BrowsingDataRemover::REMOVE_FORM_DATA) |
+        GetAsMask(data_to_remove, "history",
+                  BrowsingDataRemover::REMOVE_HISTORY) |
+        GetAsMask(data_to_remove, "indexedDB",
+                  BrowsingDataRemover::REMOVE_INDEXEDDB) |
+        GetAsMask(data_to_remove, "localStorage",
+                  BrowsingDataRemover::REMOVE_LOCAL_STORAGE) |
+        GetAsMask(data_to_remove, "pluginData",
+                  BrowsingDataRemover::REMOVE_PLUGIN_DATA) |
+        GetAsMask(data_to_remove, "passwords",
+                  BrowsingDataRemover::REMOVE_PASSWORDS) |
+        GetAsMask(data_to_remove, "serviceWorkers",
+                  BrowsingDataRemover::REMOVE_SERVICE_WORKERS) |
+        GetAsMask(data_to_remove, "cacheStorage",
+                  BrowsingDataRemover::REMOVE_CACHE_STORAGE) |
+        GetAsMask(data_to_remove, "webSQL",
+                  BrowsingDataRemover::REMOVE_WEBSQL) |
+        GetAsMask(data_to_remove, "serverBoundCertificates",
+                  BrowsingDataRemover::REMOVE_CHANNEL_IDS);
     EXPECT_EQ(expected_removal_mask, removal_mask);
   }
 
   // The kAllowDeletingBrowserHistory pref must be set to false before this
   // is called.
   void CheckRemovalPermitted(const std::string& data_types, bool permitted) {
     scoped_refptr<BrowsingDataRemoveFunction> function =
         new BrowsingDataRemoveFunction();
     std::string args = "[{\"since\": 1}," + data_types + "]";
 
@@ skipping 40 matching lines @@
   CheckRemovalPermitted("{\"cookies\": true}", true);
   CheckRemovalPermitted("{\"downloads\": true}", false);
   CheckRemovalPermitted("{\"fileSystems\": true}", true);
   CheckRemovalPermitted("{\"formData\": true}", true);
   CheckRemovalPermitted("{\"history\": true}", false);
   CheckRemovalPermitted("{\"indexedDB\": true}", true);
   CheckRemovalPermitted("{\"localStorage\": true}", true);
   CheckRemovalPermitted("{\"serverBoundCertificates\": true}", true);
   CheckRemovalPermitted("{\"passwords\": true}", true);
   CheckRemovalPermitted("{\"serviceWorkers\": true}", true);
+  CheckRemovalPermitted("{\"cacheStorage\": true}", true);
   CheckRemovalPermitted("{\"webSQL\": true}", true);
 
   // The entire removal is prohibited if any part is.
   CheckRemovalPermitted("{\"cache\": true, \"history\": true}", false);
   CheckRemovalPermitted("{\"cookies\": true, \"downloads\": true}", false);
 
   // If a prohibited type is not selected, the removal is OK.
   CheckRemovalPermitted("{\"history\": false}", true);
   CheckRemovalPermitted("{\"downloads\": false}", true);
   CheckRemovalPermitted("{\"cache\": true, \"history\": false}", true);
@@ skipping 70 matching lines @@
       "localStorage", BrowsingDataRemover::REMOVE_LOCAL_STORAGE);
   RunBrowsingDataRemoveWithKeyAndCompareRemovalMask(
       "serverBoundCertificates",
       BrowsingDataRemover::REMOVE_CHANNEL_IDS);
   RunBrowsingDataRemoveWithKeyAndCompareRemovalMask(
       "passwords", BrowsingDataRemover::REMOVE_PASSWORDS);
   // We can't remove plugin data inside a test profile.
   RunBrowsingDataRemoveWithKeyAndCompareRemovalMask(
       "serviceWorkers", BrowsingDataRemover::REMOVE_SERVICE_WORKERS);
   RunBrowsingDataRemoveWithKeyAndCompareRemovalMask(
+      "cacheStorage", BrowsingDataRemover::REMOVE_CACHE_STORAGE);
+  RunBrowsingDataRemoveWithKeyAndCompareRemovalMask(
       "webSQL", BrowsingDataRemover::REMOVE_WEBSQL);
 }
 
 // Test an arbitrary combination of data types.
 IN_PROC_BROWSER_TEST_F(ExtensionBrowsingDataTest,
                        BrowsingDataRemovalMaskCombination) {
   RunBrowsingDataRemoveFunctionAndCompareRemovalMask(
        "{\"appcache\": true, \"cookies\": true, \"history\": true}",
        BrowsingDataRemover::REMOVE_APPCACHE |
            BrowsingDataRemover::REMOVE_COOKIES |
@@ skipping 137 matching lines @@
 
   SetPrefsAndVerifySettings(
       BrowsingDataRemover::REMOVE_COOKIES |
           BrowsingDataRemover::REMOVE_HISTORY |
           BrowsingDataRemover::REMOVE_DOWNLOADS,
     UNPROTECTED_WEB,
     site_data_no_plugins |
         BrowsingDataRemover::REMOVE_HISTORY |
         BrowsingDataRemover::REMOVE_DOWNLOADS);
 }