Grant origins engagement for having interactions on their notifications.

chrome/browser/engagement/site_engagement_score.h

Index: chrome/browser/engagement/site_engagement_score.h
diff --git a/chrome/browser/engagement/site_engagement_score.h b/chrome/browser/engagement/site_engagement_score.h
index 861799a737ffc5df34fe992ad6f9753c75fb2f7a..358f97d6cf79dfcee6ac4703bc3b7c15b3654758 100644
--- a/chrome/browser/engagement/site_engagement_score.h
+++ b/chrome/browser/engagement/site_engagement_score.h
@@ -84,9 +84,12 @@ class SiteEngagementScore {
     // period prior to clock_->Now().
     LAST_ENGAGEMENT_GRACE_PERIOD_IN_HOURS,
 
-    // THe number of points given for having notification permission granted.
+    // The number of points given for having notification permission granted.
     NOTIFICATION_PERMISSION_POINTS,
 
+    // The number of points given for interacting with a displayed notification.
+    NOTIFICATION_INTERACTION_POINTS,
+
     MAX_VARIATION
   };
 
@@ -110,6 +113,11 @@ class SiteEngagementScore {
   static double GetMaxDecaysPerScore();
   static double GetLastEngagementGracePeriodInHours();
   static double GetNotificationPermissionPoints();
+  static double GetNotificationInteractionPoints();
+
+  // Sets fixed parameter values for testing site engagement. Ensure that any

[dominickn, 2017/03/16 06:36:55]

This is now public to allow it to be called from the static
SetParamValuesForTesting() in SiteEngagementServiceAndroid (i.e. allow it to be
called across the JNI).

+  // newly added parameters receive a fixed value here.
+  static void SetParamValuesForTesting();
 
   // Update the default engagement settings via variations.
   static void UpdateFromVariations(const char* param_name);
@@ -165,11 +173,6 @@ class SiteEngagementScore {
   FRIEND_TEST_ALL_PREFIXES(SiteEngagementScoreTest, PartiallyEmptyDictionary);
   FRIEND_TEST_ALL_PREFIXES(SiteEngagementScoreTest, PopulatedDictionary);
   FRIEND_TEST_ALL_PREFIXES(SiteEngagementScoreTest, Reset);
-  friend class ChromePluginServiceFilterTest;
-  friend class ImportantSitesUtil;
-  friend class ImportantSitesUtilTest;
-  friend class PushMessagingBrowserTest;
-  friend class SiteEngagementHelperTest;
   friend class SiteEngagementScoreTest;
   friend class SiteEngagementServiceTest;
 
@@ -196,10 +199,6 @@ class SiteEngagementScore {
   // Determine any score bonus from having installed shortcuts.
   double BonusScore() const;
 
-  // Sets fixed parameter values for testing site engagement. Ensure that any
-  // newly added parameters receive a fixed value here.
-  static void SetParamValuesForTesting();
-
   // Updates the content settings dictionary |score_dict| with the current score
   // fields. Returns true if |score_dict| changed, otherwise return false.
   bool UpdateScoreDict(base::DictionaryValue* score_dict);