[Durable] Clear durable permission when clearing site data.

chrome/browser/extensions/api/browsing_data/browsing_data_test.cc

Index: chrome/browser/extensions/api/browsing_data/browsing_data_test.cc
diff --git a/chrome/browser/extensions/api/browsing_data/browsing_data_test.cc b/chrome/browser/extensions/api/browsing_data/browsing_data_test.cc
index 43361468e480868a34d7e05ae5db253991c9ac57..aa8d2f02adca9045608908414c140c03593afbf0 100644
--- a/chrome/browser/extensions/api/browsing_data/browsing_data_test.cc
+++ b/chrome/browser/extensions/api/browsing_data/browsing_data_test.cc
@@ -305,16 +305,20 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowsingDataTest, RemoveBrowsingDataAll) {
 
   EXPECT_EQ(base::Time::FromDoubleT(1.0), GetBeginTime());
   EXPECT_EQ((BrowsingDataRemover::REMOVE_SITE_DATA |
-      BrowsingDataRemover::REMOVE_CACHE |
-      BrowsingDataRemover::REMOVE_DOWNLOADS |
-      BrowsingDataRemover::REMOVE_FORM_DATA |
-      BrowsingDataRemover::REMOVE_HISTORY |
-      BrowsingDataRemover::REMOVE_PASSWORDS) &
-      // TODO(benwells): implement clearing of site usage data via the browsing
-      // data API. https://crbug.com/500801.
-      ~BrowsingDataRemover::REMOVE_SITE_USAGE_DATA &
-      // We can't remove plugin data inside a test profile.
-      ~BrowsingDataRemover::REMOVE_PLUGIN_DATA, GetRemovalMask());
+             BrowsingDataRemover::REMOVE_CACHE |
+             BrowsingDataRemover::REMOVE_DOWNLOADS |
+             BrowsingDataRemover::REMOVE_FORM_DATA |
+             BrowsingDataRemover::REMOVE_HISTORY |
+             BrowsingDataRemover::REMOVE_PASSWORDS) &
+             // TODO(benwells): implement clearing of site usage data via the
+             // browsing data API. https://crbug.com/500801.
+             ~BrowsingDataRemover::REMOVE_SITE_USAGE_DATA &
+             // TODO(dmurph): implement clearing of durable storage permission
+             // via the browsing data API. https://crbug.com/500801.
+             ~BrowsingDataRemover::REMOVE_DURABLE_PERMISSION &
+             // We can't remove plugin data inside a test profile.
+             ~BrowsingDataRemover::REMOVE_PLUGIN_DATA,
+            GetRemovalMask());
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionBrowsingDataTest, BrowsingDataOriginTypeMask) {
@@ -492,8 +496,10 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowsingDataTest, SettingsFunctionSimple) {
 IN_PROC_BROWSER_TEST_F(ExtensionBrowsingDataTest, SettingsFunctionSiteData) {
   int site_data_no_usage = BrowsingDataRemover::REMOVE_SITE_DATA &
       ~BrowsingDataRemover::REMOVE_SITE_USAGE_DATA;
-  int site_data_no_plugins = site_data_no_usage &
-      ~BrowsingDataRemover::REMOVE_PLUGIN_DATA;
+  int site_data_no_durable =
+      site_data_no_usage & ~BrowsingDataRemover::REMOVE_DURABLE_PERMISSION;
+  int site_data_no_plugins = site_data_no_usage & site_data_no_durable &

[msramek, 2016/09/26 12:59:00]

nit: These constants exclude more than they claim. Can we rename them?

[dmurph, 2016/09/28 18:12:51]

Done.

+                             ~BrowsingDataRemover::REMOVE_PLUGIN_DATA;
 
   SetPrefsAndVerifySettings(BrowsingDataRemover::REMOVE_COOKIES,
                             UNPROTECTED_WEB,
@@ -517,8 +523,9 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowsingDataTest, SettingsFunctionSiteData) {
 // Test an arbitrary assortment of settings.
 IN_PROC_BROWSER_TEST_F(ExtensionBrowsingDataTest, SettingsFunctionAssorted) {
   int site_data_no_plugins = BrowsingDataRemover::REMOVE_SITE_DATA &

[msramek, 2016/09/26 12:59:00]

Ditto here. I know that it was already wrong before, but please rename to e.g.
|site_data_supported_types|.

-      ~BrowsingDataRemover::REMOVE_SITE_USAGE_DATA &
-      ~BrowsingDataRemover::REMOVE_PLUGIN_DATA;
+                             ~BrowsingDataRemover::REMOVE_DURABLE_PERMISSION &
+                             ~BrowsingDataRemover::REMOVE_SITE_USAGE_DATA &
+                             ~BrowsingDataRemover::REMOVE_PLUGIN_DATA;
 
   SetPrefsAndVerifySettings(
       BrowsingDataRemover::REMOVE_COOKIES |