Add "Site Settings" option to Clear Browsing Data on Android

chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_unittest.cc

Index: chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_unittest.cc
diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_unittest.cc b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_unittest.cc
index b642b8190fd5b2cd0d4a7c85a33ca1372287e7e0..c8f776d42b75ac28b494c7c05426b265dcf692a5 100644
--- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_unittest.cc
+++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_unittest.cc
@@ -1591,6 +1591,49 @@ TEST_F(ChromeBrowsingDataRemoverDelegateTest,
       << host_settings[2].primary_pattern.ToString();
 }
 
+TEST_F(ChromeBrowsingDataRemoverDelegateTest, RemoveAllContentSettings) {

[msramek, 2017/05/08 10:53:56]

The test is named "RemoveAll", but in fact it tests filtering, i.e. removing not
all :)

Let's just call it "RemoveContentSettings", and I recommend testing both
complete and partial deletions:
1. Remove some settings.
2. Test that some settings remained.
3. Then remove all settings.
4. Test that only the wildcard remained.

+  auto* map = HostContentSettingsMapFactory::GetForProfile(GetProfile());
+  map->SetContentSettingDefaultScope(kOrigin1, kOrigin1,
+                                     CONTENT_SETTINGS_TYPE_GEOLOCATION, "",

[msramek, 2017/05/08 10:53:56]

nit: std::string()

[dullweber, 2017/05/08 15:50:23]

Done.

+                                     CONTENT_SETTING_ALLOW);
+  map->SetContentSettingDefaultScope(kOrigin2, kOrigin2,
+                                     CONTENT_SETTINGS_TYPE_GEOLOCATION, "",
+                                     CONTENT_SETTING_ALLOW);
+

[msramek, 2017/05/08 10:53:56]

Let's add one more content type in order to document that this deletes all
content settings, not just geolocation.

[dullweber, 2017/05/08 15:50:24]

Done.

+  // Clear all except for origin1 and origin3.
+  std::unique_ptr<BrowsingDataFilterBuilder> filter(
+      BrowsingDataFilterBuilder::Create(BrowsingDataFilterBuilder::BLACKLIST));
+  filter->AddRegisterableDomain(kTestRegisterableDomain1);
+  filter->AddRegisterableDomain(kTestRegisterableDomain3);
+  BlockUntilOriginDataRemoved(
+      base::Time(), base::Time::Max(),
+      ChromeBrowsingDataRemoverDelegate::DATA_TYPE_CONTENT_SETTINGS,
+      std::move(filter));
+
+  EXPECT_EQ(ChromeBrowsingDataRemoverDelegate::DATA_TYPE_CONTENT_SETTINGS,
+            GetRemovalMask());
+  EXPECT_EQ(content::BrowsingDataRemover::ORIGIN_TYPE_UNPROTECTED_WEB,
+            GetOriginTypeMask());
+
+  // Verify we only have allow for the first origin.
+  ContentSettingsForOneType host_settings;
+  map->GetSettingsForOneType(CONTENT_SETTINGS_TYPE_GEOLOCATION, std::string(),
+                             &host_settings);
+
+  ASSERT_EQ(2u, host_settings.size());
+  // Only the first should should have a setting.
+  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);
+
+  // 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);
+}
+
 TEST_F(ChromeBrowsingDataRemoverDelegateTest, RemoveDurablePermission) {
   // Add our settings.
   HostContentSettingsMap* host_content_settings_map =