[Durable] Clear durable permission when clearing site data.

chrome/browser/browsing_data/browsing_data_remover_unittest.cc

Index: chrome/browser/browsing_data/browsing_data_remover_unittest.cc
diff --git a/chrome/browser/browsing_data/browsing_data_remover_unittest.cc b/chrome/browser/browsing_data/browsing_data_remover_unittest.cc
index 241034dcf96a253aa0aaf4f2a6f5335599c7b11d..bb9a8a4c1da904353d4bea845f9e492ec693da09 100644
--- a/chrome/browser/browsing_data/browsing_data_remover_unittest.cc
+++ b/chrome/browser/browsing_data/browsing_data_remover_unittest.cc
@@ -43,6 +43,7 @@
 #include "chrome/browser/password_manager/password_store_factory.h"
 #include "chrome/browser/permissions/permission_decision_auto_blocker.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
+#include "chrome/browser/storage/durable_storage_permission_context.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile.h"
@@ -2628,6 +2629,51 @@ TEST_F(BrowsingDataRemoverTest, RemoveContentSettingsWithBlacklist) {
       << host_settings[2].primary_pattern.ToString();
 }
 
+TEST_F(BrowsingDataRemoverTest, RemoveDurablePermission) {
+  // Add our settings.
+  HostContentSettingsMap* host_content_settings_map =
+      HostContentSettingsMapFactory::GetForProfile(GetProfile());
+
+  DurableStoragePermissionContext durable_permission(GetProfile());
+  durable_permission.UpdateContentSetting(kOrigin1, GURL(),
+                                          CONTENT_SETTING_ALLOW);
+  durable_permission.UpdateContentSetting(kOrigin2, GURL(),
+                                          CONTENT_SETTING_ALLOW);
+
+  // Clear all except for origin1 and origin3.
+  RegistrableDomainFilterBuilder filter(
+      RegistrableDomainFilterBuilder::BLACKLIST);
+  filter.AddRegisterableDomain(kTestRegisterableDomain1);
+  filter.AddRegisterableDomain(kTestRegisterableDomain3);
+  BlockUntilOriginDataRemoved(browsing_data::LAST_HOUR,
+                              BrowsingDataRemover::REMOVE_DURABLE_PERMISSION,
+                              filter);
+
+  EXPECT_EQ(BrowsingDataRemover::REMOVE_DURABLE_PERMISSION, GetRemovalMask());
+  EXPECT_EQ(BrowsingDataHelper::UNPROTECTED_WEB, GetOriginTypeMask());
+
+  // Verify we only have allow

[msramek, 2016/09/21 13:46:11]

I don't think that's what we're verifying. Both added exceptions are ALLOW, so
even if the deletion failed, we would only have ALLOW.

+  ContentSettingsForOneType host_settings;
+  host_content_settings_map->GetSettingsForOneType(
+      CONTENT_SETTINGS_TYPE_DURABLE_STORAGE, std::string(), &host_settings);
+
+  ASSERT_TRUE(host_settings.size() >= 1u);

[msramek, 2016/09/21 13:46:11]

This seems unnecessary given the next line.

[dmurph, 2016/09/21 20:37:51]

Done.

+  EXPECT_EQ(2u, host_settings.size());
+  // The second origin should be deleted.

[msramek, 2016/09/21 13:46:11]

nit: I would instead say "only the first origin should have been left", as
that's what you're testing.

[dmurph, 2016/09/21 20:37:51]

Done.

+  EXPECT_EQ(ContentSettingsPattern::FromURLNoWildcard(kOrigin1),
+            host_settings[0].primary_pattern)
+      << host_settings[0].primary_pattern.ToString();
+  EXPECT_EQ(CONTENT_SETTING_ALLOW, host_settings[0].setting)
+      << host_settings[0].primary_pattern.ToString();

[msramek, 2016/09/21 13:46:11]

This output seems out of place - should that be |host_settings[0].setting|
instead? Also below.

[dmurph, 2016/09/21 20:37:51]

Done.

+
+  // And our wildcard.
+  EXPECT_EQ(ContentSettingsPattern::Wildcard(),
+            host_settings[1].primary_pattern)
+      << host_settings[1].primary_pattern.ToString();
+  EXPECT_EQ(CONTENT_SETTING_ASK, host_settings[1].setting)
+      << host_settings[1].primary_pattern.ToString();
+}
+
 // Test that removing cookies clears HTTP auth data.
 TEST_F(BrowsingDataRemoverTest, ClearHttpAuthCache_RemoveCookies) {
   net::HttpNetworkSession* http_session = GetProfile()