Remove site engagement from cookie counter

Site engagement entries are currently included in the cookie counter.
This creates an entry for every single site visited, which is
especially confusing when cookies are turned off. Site engagement
doesn't act like a cookie (it can't be read or written by a site), so
this CL removes it from the counter.

Bug: 782606
Change-Id: Ia0953b8a34b3899d19fe19af1da3c8ec21600f23
Reviewed-on: https://chromium-review.googlesource.com/774283
Commit-Queue: Christian Dullweber <dullweber@chromium.org>
Reviewed-by: Martin Šrámek <msramek@chromium.org>
Cr-Commit-Position: refs/heads/master@{#518592}

chrome/browser/browsing_data/browsing_data_remover_browsertest.cc

@@ -155,8 +155,7 @@ class BrowsingDataRemoverBrowserTest : public InProcessBrowserTest {
     EXPECT_EQ(0, GetSiteDataCount());
     GURL url = embedded_test_server()->GetURL("/browsing_data/site_data.html");
     ui_test_utils::NavigateToURL(browser(), url);
-    // We don't want to measure site engagement entries.
-    RemoveSiteEngagement();
+
     EXPECT_EQ(0, GetSiteDataCount());
     EXPECT_FALSE(HasDataForType(type));
 
@@ -175,7 +174,6 @@ class BrowsingDataRemoverBrowserTest : public InProcessBrowserTest {
     EXPECT_EQ(0, GetSiteDataCount());
     GURL url = embedded_test_server()->GetURL("/browsing_data/site_data.html");
     ui_test_utils::NavigateToURL(browser(), url);
-    RemoveSiteEngagement();
     EXPECT_EQ(0, GetSiteDataCount());
     // Opening a store of this type creates a site data entry.
     EXPECT_FALSE(HasDataForType(type));
@@ -192,11 +190,6 @@ class BrowsingDataRemoverBrowserTest : public InProcessBrowserTest {
     ASSERT_TRUE(RunScriptAndGetBool("set" + type + "()"));
   }
 
-  void RemoveSiteEngagement() {
-    HostContentSettingsMapFactory::GetForProfile(browser()->profile())
-        ->ClearSettingsForOneType(CONTENT_SETTINGS_TYPE_SITE_ENGAGEMENT);
-  }
-
   int GetSiteDataCount() {
     base::RunLoop run_loop;
     int count = -1;
@@ -407,16 +400,6 @@ IN_PROC_BROWSER_TEST_F(BrowsingDataRemoverBrowserTest,
   block_state = ExternalProtocolHandler::GetBlockState("tel", profile);
   ASSERT_EQ(ExternalProtocolHandler::UNKNOWN, block_state);
 }
-// Visiting a site creates a site engagement entry. Test that it is counted and
-// deleted properly.
-IN_PROC_BROWSER_TEST_F(BrowsingDataRemoverBrowserTest, SiteEngagementDeletion) {
-  EXPECT_EQ(0, GetSiteDataCount());
-  GURL url = embedded_test_server()->GetURL("/browsing_data/site_data.html");
-  ui_test_utils::NavigateToURL(browser(), url);
-  EXPECT_EQ(1, GetSiteDataCount());
-  RemoveAndWait(ChromeBrowsingDataRemoverDelegate::DATA_TYPE_SITE_DATA);
-  EXPECT_EQ(0, GetSiteDataCount());
-}
 
 IN_PROC_BROWSER_TEST_F(BrowsingDataRemoverBrowserTest, CookieDeletion) {
   TestSiteData("Cookie");
@@ -437,7 +420,6 @@ IN_PROC_BROWSER_TEST_F(BrowsingDataRemoverBrowserTest, SessionStorageCounting) {
   EXPECT_EQ(0, GetSiteDataCount());
   GURL url = embedded_test_server()->GetURL("/browsing_data/site_data.html");
   ui_test_utils::NavigateToURL(browser(), url);
-  RemoveSiteEngagement();
   EXPECT_EQ(0, GetSiteDataCount());
   SetDataForType("SessionStorage");
   EXPECT_EQ(0, GetSiteDataCount());

chrome/browser/browsing_data/site_data_counting_helper.cc

@@ -96,8 +96,7 @@ void SiteDataCountingHelper::CountAndDestroySelfWhenFinished() {
   // Counting site usage data and durable permissions.
   auto* hcsm = HostContentSettingsMapFactory::GetForProfile(profile_);
   const ContentSettingsType content_settings[] = {
-      CONTENT_SETTINGS_TYPE_DURABLE_STORAGE,
-      CONTENT_SETTINGS_TYPE_SITE_ENGAGEMENT, CONTENT_SETTINGS_TYPE_APP_BANNER};
+      CONTENT_SETTINGS_TYPE_DURABLE_STORAGE, CONTENT_SETTINGS_TYPE_APP_BANNER};
   for (auto type : content_settings) {
     tasks_ += 1;
     GetOriginsFromHostContentSettignsMap(hcsm, type);