Add SiteEngagementService::GetAllDetails(), to return detailed scores.

chrome/browser/engagement/site_engagement_service_unittest.cc

 // Copyright 2015 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 "chrome/browser/engagement/site_engagement_service.h"
 
 #include <utility>
 
 #include "base/files/scoped_temp_dir.h"
 #include "base/macros.h"
@@ skipping 530 matching lines @@
   clock_->SetNow(GetReferenceTime());
 
   EXPECT_EQ(0, service_->GetScore(url1));
   EXPECT_EQ(0, service_->GetScore(url2));
   EXPECT_EQ(0, service_->GetScore(url3));
 
   HostContentSettingsMap* settings_map =
       HostContentSettingsMapFactory::GetForProfile(profile());
 
   settings_map->SetContentSettingDefaultScope(
-      url1, url1, CONTENT_SETTINGS_TYPE_NOTIFICATIONS, std::string(),
-      CONTENT_SETTING_ALLOW);
+      url1, GURL(), CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
+      content_settings::ResourceIdentifier(), CONTENT_SETTING_ALLOW);
 
   settings_map->SetContentSettingDefaultScope(
-      url2, url2, CONTENT_SETTINGS_TYPE_NOTIFICATIONS, std::string(),
-      CONTENT_SETTING_BLOCK);
+      url2, GURL(), CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
+      content_settings::ResourceIdentifier(), CONTENT_SETTING_BLOCK);
 
   settings_map->SetContentSettingDefaultScope(
-      url3, url3, CONTENT_SETTINGS_TYPE_NOTIFICATIONS, std::string(),
-      CONTENT_SETTING_ASK);
+      url3, GURL(), CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
+      content_settings::ResourceIdentifier(), CONTENT_SETTING_ASK);
 
   EXPECT_EQ(5, service_->GetScore(url1));
   EXPECT_EQ(0, service_->GetScore(url2));
   EXPECT_EQ(0, service_->GetScore(url3));
 
   service_->AddPoints(url1, 1.0);
   service_->AddPoints(url2, 3.0);
   EXPECT_EQ(6, service_->GetScore(url1));
   EXPECT_EQ(3, service_->GetScore(url2));
 
   settings_map->SetContentSettingDefaultScope(
-      url1, url1, CONTENT_SETTINGS_TYPE_NOTIFICATIONS, std::string(),
-      CONTENT_SETTING_BLOCK);
+      url1, GURL(), CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
+      content_settings::ResourceIdentifier(), CONTENT_SETTING_BLOCK);
 
   EXPECT_EQ(1, service_->GetScore(url1));
 }
 
 TEST_F(SiteEngagementServiceTest, CheckHistograms) {
   base::HistogramTester histograms;
 
   base::Time current_day = GetReferenceTime();
   clock_->SetNow(current_day);
 
@@ skipping 1244 matching lines @@
 
   EXPECT_EQ(3, CheckScoreFromSettingsOnThread(content::BrowserThread::IO,
                                               settings_map, url1));
   EXPECT_EQ(3, CheckScoreFromSettingsOnThread(content::BrowserThread::FILE,
                                               settings_map, url2));
   EXPECT_EQ(4, CheckScoreFromSettingsOnThread(content::BrowserThread::FILE,
                                               incognito_settings_map, url1));
   EXPECT_EQ(3, CheckScoreFromSettingsOnThread(content::BrowserThread::IO,
                                               incognito_settings_map, url2));
 }
+
+TEST_F(SiteEngagementServiceTest, GetAllDetailsIncludesBonusOnlyScores) {
+  GURL url1("http://www.google.com/");
+  GURL url2("https://www.google.com/");
+  GURL url3("https://drive.google.com/");
+  GURL url4("https://nothing.google.com/");
+
+  std::vector<mojom::SiteEngagementDetails> details = service_->GetAllDetails();
+  EXPECT_EQ(0u, details.size());
+
+  // Add a single site score via explicitly resetting the engagement score.
+  service_->ResetBaseScoreForURL(url1, 5);
+
+  // Add a second site indirectly, via notifications permissions.
+  HostContentSettingsMap* settings_map =
+      HostContentSettingsMapFactory::GetForProfile(profile());
+  settings_map->SetContentSettingDefaultScope(
+      url2, GURL(), CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
+      content_settings::ResourceIdentifier(), CONTENT_SETTING_ALLOW);
+
+  // Add third and fourth sites with notifications permission explicitly denied,
+  // to verify that they are not included.
+  settings_map->SetContentSettingDefaultScope(
+      url3, GURL(), CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
+      content_settings::ResourceIdentifier(), CONTENT_SETTING_BLOCK);
+  settings_map->SetContentSettingDefaultScope(
+      url4, GURL(), CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
+      content_settings::ResourceIdentifier(), CONTENT_SETTING_BLOCK);
+
+  // Verify that the URLs with engagement, and with notifications permission
+  // boosted engagement total, are included.
+  details = service_->GetAllDetails();
+  EXPECT_EQ(2u, details.size());
+}