Grant bonus engagement to origins with notification permission.

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"
 #include "base/strings/string_number_conversions.h"
 #include "base/time/clock.h"
 #include "base/time/time.h"
 #include "base/values.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/engagement/site_engagement_metrics.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
+#include "components/content_settings/core/common/content_settings.h"
+#include "components/content_settings/core/common/content_settings_types.h"
 #include "components/variations/variations_associated_data.h"
 
 namespace {
 
 // Delta within which to consider scores equal.
 const double kScoreDelta = 0.001;
 
 // Delta within which to consider internal time values equal. Internal time
 // values are in microseconds, so this delta comes out at one second.
 const double kTimeDelta = 1000000;
@@ skipping 53 matching lines @@
   param_values[VISIBLE_MEDIA_POINTS] = {"visible_media_playing_points", 0.06};
   param_values[HIDDEN_MEDIA_POINTS] = {"hidden_media_playing_points", 0.01};
   param_values[WEB_APP_INSTALLED_POINTS] = {"web_app_installed_points", 5};
   param_values[FIRST_DAILY_ENGAGEMENT] = {"first_daily_engagement_points", 1.5};
   param_values[BOOTSTRAP_POINTS] = {"bootstrap_points", 24};
   param_values[MEDIUM_ENGAGEMENT_BOUNDARY] = {"medium_engagement_boundary", 15};
   param_values[HIGH_ENGAGEMENT_BOUNDARY] = {"high_engagement_boundary", 50};
   param_values[MAX_DECAYS_PER_SCORE] = {"max_decays_per_score", 4};
   param_values[LAST_ENGAGEMENT_GRACE_PERIOD_IN_HOURS] = {
       "last_engagement_grace_period_in_hours", 1};
+  param_values[NOTIFICATION_PERMISSION_POINTS] = {
+      "notification_permission_points", 5};
   return param_values;
 }
 
 double SiteEngagementScore::GetMaxPointsPerDay() {
   return GetParamValues()[MAX_POINTS_PER_DAY].second;
 }
 
 double SiteEngagementScore::GetDecayPeriodInHours() {
   return GetParamValues()[DECAY_PERIOD_IN_HOURS].second;
 }
@@ skipping 47 matching lines @@
 }
 
 double SiteEngagementScore::GetMaxDecaysPerScore() {
   return GetParamValues()[MAX_DECAYS_PER_SCORE].second;
 }
 
 double SiteEngagementScore::GetLastEngagementGracePeriodInHours() {
   return GetParamValues()[LAST_ENGAGEMENT_GRACE_PERIOD_IN_HOURS].second;
 }
 
+double SiteEngagementScore::GetNotificationPermissionPoints() {
+  return GetParamValues()[NOTIFICATION_PERMISSION_POINTS].second;
+}
+
 // static
 void SiteEngagementScore::UpdateFromVariations(const char* param_name) {
   double param_vals[MAX_VARIATION];
 
   for (int i = 0; i < MAX_VARIATION; ++i) {
     std::string param_string = variations::GetVariationParamValue(
         param_name, GetParamValues()[i].first);
 
     // Bail out if we didn't get a param string for the key, or if we couldn't
     // convert the param string to a double, or if we get a negative value.
@@ skipping 158 matching lines @@
 SiteEngagementScore::SiteEngagementScore(
     base::Clock* clock,
     const GURL& origin,
     std::unique_ptr<base::DictionaryValue> score_dict)
     : clock_(clock),
       raw_score_(0),
       points_added_today_(0),
       last_engagement_time_(),
       last_shortcut_launch_time_(),
       score_dict_(score_dict.release()),
-      origin_(origin) {
+      origin_(origin),
+      settings_map_(nullptr) {
   if (!score_dict_)
     return;
 
   score_dict_->GetDouble(kRawScoreKey, &raw_score_);
   score_dict_->GetDouble(kPointsAddedTodayKey, &points_added_today_);
 
   double internal_time;
   if (score_dict_->GetDouble(kLastEngagementTimeKey, &internal_time))
     last_engagement_time_ = base::Time::FromInternalValue(internal_time);
   if (score_dict_->GetDouble(kLastShortcutLaunchTimeKey, &internal_time))
     last_shortcut_launch_time_ = base::Time::FromInternalValue(internal_time);
 }
 
 double SiteEngagementScore::DecayedScore() const {
   // Note that users can change their clock, so from this system's perspective
   // time can go backwards. If that does happen and the system detects that the
   // current day is earlier than the last engagement, no decay (or growth) is
   // applied.
   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;
   int days_since_shortcut_launch =
       (clock_->Now() - last_shortcut_launch_time_).InDays();
   if (days_since_shortcut_launch <= kMaxDaysSinceShortcutLaunch)
-    return GetWebAppInstalledPoints();
+    bonus += GetWebAppInstalledPoints();
 
-  return 0;
+  // TODO(dominickn, raymes): call PermissionManager::GetPermissionStatus when
+  // the PermissionManager is thread-safe.
+  if (settings_map_ &&
+      settings_map_->GetContentSetting(
+          origin_, origin_, CONTENT_SETTINGS_TYPE_NOTIFICATIONS,

[Peter Beverloo, 2017/03/09 15:41:12]

Per NotificationPermissionContext::UpdateContentSetting and the
DesktopNotificationProfileUtil, we store the content settings with [requesting
origin, GURL()] as opposed to [requesting origin, embedding origin].

Here we use the origin twice. Does that matter?

[dominickn, 2017/03/09 22:13:17]

I'm fairly sure it gets wiped in the content settings layer, but for safety I've
switched to GURL() for the second argument.

+          std::string()) == CONTENT_SETTING_ALLOW) {
+    bonus += GetNotificationPermissionPoints();
+  }
+
+  return bonus;
 }
 
 void SiteEngagementScore::SetParamValuesForTesting() {
   GetParamValues()[MAX_POINTS_PER_DAY].second = 5;
   GetParamValues()[DECAY_PERIOD_IN_HOURS].second = 7 * 24;
   GetParamValues()[DECAY_POINTS].second = 5;
   GetParamValues()[NAVIGATION_POINTS].second = 0.5;
   GetParamValues()[USER_INPUT_POINTS].second = 0.05;
   GetParamValues()[VISIBLE_MEDIA_POINTS].second = 0.02;
   GetParamValues()[HIDDEN_MEDIA_POINTS].second = 0.01;
   GetParamValues()[WEB_APP_INSTALLED_POINTS].second = 5;
   GetParamValues()[BOOTSTRAP_POINTS].second = 8;
   GetParamValues()[MEDIUM_ENGAGEMENT_BOUNDARY].second = 5;
   GetParamValues()[HIGH_ENGAGEMENT_BOUNDARY].second = 50;
   GetParamValues()[MAX_DECAYS_PER_SCORE].second = 1;
   GetParamValues()[LAST_ENGAGEMENT_GRACE_PERIOD_IN_HOURS].second = 72;
+  GetParamValues()[NOTIFICATION_PERMISSION_POINTS].second = 5;
 
   // This is set to values that avoid interference with tests and are set when
   // testing these features.
   GetParamValues()[FIRST_DAILY_ENGAGEMENT].second = 0;
   GetParamValues()[DECAY_PROPORTION].second = 1;
   GetParamValues()[SCORE_CLEANUP_THRESHOLD].second = 0;
 }