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

chrome/browser/engagement/site_engagement_score.cc

 // Copyright 2016 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_score.h"
 
 #include <cmath>
 #include <utility>
 
 #include "base/memory/ptr_util.h"
@@ skipping 28 matching lines @@
 
 std::unique_ptr<base::DictionaryValue> GetScoreDictForSettings(
     const HostContentSettingsMap* settings,
     const GURL& origin_url) {
   if (!settings)
     return base::MakeUnique<base::DictionaryValue>();
 
   std::unique_ptr<base::DictionaryValue> value =
       base::DictionaryValue::From(settings->GetWebsiteSetting(
           origin_url, origin_url, CONTENT_SETTINGS_TYPE_SITE_ENGAGEMENT,
-          std::string(), NULL));
+          content_settings::ResourceIdentifier(), NULL));
 
   if (value.get())
     return value;
 
   return base::MakeUnique<base::DictionaryValue>();
 }
 
 }  // namespace
 
 const double SiteEngagementScore::kMaxPoints = 100;
@@ skipping 203 matching lines @@
   double to_add = std::min(kMaxPoints - raw_score_,
                            GetMaxPointsPerDay() - points_added_today_);
   to_add = std::min(to_add, points);
 
   points_added_today_ += to_add;
   raw_score_ += to_add;
 
   last_engagement_time_ = now;
 }
 
-double SiteEngagementScore::GetScore() const {
-  return std::min(DecayedScore() + BonusScore(), kMaxPoints);
+double SiteEngagementScore::GetTotalScore() const {
+  return std::min(
+      DecayedScore() + BonusIfShortcutLaunched() + BonusIfHasNotifications(),
+      kMaxPoints);
+}
+
+mojom::SiteEngagementDetails SiteEngagementScore::GetDetails() const {
+  mojom::SiteEngagementDetails engagement;
+  engagement.origin = origin_;
+  engagement.base_score = DecayedScore();
+  engagement.installed_bonus = BonusIfShortcutLaunched();
+  engagement.notifications_bonus = BonusIfHasNotifications();
+  engagement.total_score = GetTotalScore();
+  return engagement;
 }
 
 void SiteEngagementScore::Commit() {
   DCHECK(settings_map_);
   if (!UpdateScoreDict(score_dict_.get()))
     return;
 
   settings_map_->SetWebsiteSettingDefaultScope(
-      origin_, GURL(), CONTENT_SETTINGS_TYPE_SITE_ENGAGEMENT, std::string(),
-      std::move(score_dict_));
+      origin_, GURL(), CONTENT_SETTINGS_TYPE_SITE_ENGAGEMENT,
+      content_settings::ResourceIdentifier(), std::move(score_dict_));
 }
 
 blink::mojom::EngagementLevel SiteEngagementScore::GetEngagementLevel() const {
   DCHECK_LT(GetMediumEngagementBoundary(), GetHighEngagementBoundary());
 
-  double score = GetScore();
+  double score = GetTotalScore();
   if (score == 0)
     return blink::mojom::EngagementLevel::NONE;
 
   if (score < 1)
     return blink::mojom::EngagementLevel::MINIMAL;
 
   if (score < GetMediumEngagementBoundary())
     return blink::mojom::EngagementLevel::LOW;
 
   if (score < GetHighEngagementBoundary())
@@ skipping 92 matching lines @@
   int hours_since_engagement =
       (clock_->Now() - last_engagement_time_).InHours();
   if (hours_since_engagement < 0)
     return raw_score_;
 
   int periods = hours_since_engagement / GetDecayPeriodInHours();
   return std::max(0.0, raw_score_ * pow(GetDecayProportion(), periods) -
                            periods * GetDecayPoints());
 }
 
-double SiteEngagementScore::BonusScore() const {
-  double bonus = 0;
+double SiteEngagementScore::BonusIfShortcutLaunched() const {
   int days_since_shortcut_launch =
       (clock_->Now() - last_shortcut_launch_time_).InDays();
   if (days_since_shortcut_launch <= kMaxDaysSinceShortcutLaunch)
-    bonus += GetWebAppInstalledPoints();
+    return GetWebAppInstalledPoints();
+  return 0;
+}
 
+double SiteEngagementScore::BonusIfHasNotifications() const {
   // TODO(dominickn, raymes): call PermissionManager::GetPermissionStatus when
   // the PermissionManager is thread-safe.
-  if (settings_map_ && settings_map_->GetContentSetting(
-                           origin_, GURL(), CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
-                           std::string()) == CONTENT_SETTING_ALLOW) {
-    bonus += GetNotificationPermissionPoints();
+  if (settings_map_ &&
+      settings_map_->GetContentSetting(
+          origin_, GURL(), CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
+          content_settings::ResourceIdentifier()) == CONTENT_SETTING_ALLOW) {
+    return GetNotificationPermissionPoints();
   }
 
-  return bonus;
+  return 0;
 }