Grant origins engagement for having interactions on their notifications.

chrome/browser/engagement/site_engagement_score.h

 // 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.
 
 #ifndef CHROME_BROWSER_ENGAGEMENT_SITE_ENGAGEMENT_SCORE_H_
 #define CHROME_BROWSER_ENGAGEMENT_SITE_ENGAGEMENT_SCORE_H_
 
 #include <array>
 #include <memory>
 
@@ skipping 66 matching lines @@
     // the max decay period, i.e. the maximum duration permitted for
     // (clock_->Now() - score.last_engagement_time()).
     MAX_DECAYS_PER_SCORE,
 
     // If a SiteEngagamentScore has not been accessed or updated for a period
     // longer than the max decay period + LAST_ENGAGEMENT_GRACE_PERIOD_IN_HOURS
     // (see above), its last engagement time will be reset to be max decay
     // 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
   };
 
   // The maximum number of points that are allowed.
   static const double kMaxPoints;
 
   static double GetMaxPointsPerDay();
   static double GetDecayPeriodInHours();
   static double GetDecayPoints();
   static double GetDecayProportion();
   static double GetScoreCleanupThreshold();
   static double GetNavigationPoints();
   static double GetUserInputPoints();
   static double GetVisibleMediaPoints();
   static double GetHiddenMediaPoints();
   static double GetWebAppInstalledPoints();
   static double GetFirstDailyEngagementPoints();
   static double GetBootstrapPoints();
   static double GetMediumEngagementBoundary();
   static double GetHighEngagementBoundary();
   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);
 
   // The SiteEngagementScore does not take ownership of |clock|. It is the
   // responsibility of the caller to make sure |clock| outlives this
   // SiteEngagementScore.
   SiteEngagementScore(base::Clock* clock,
                       const GURL& origin,
                       HostContentSettingsMap* settings);
@@ skipping 35 matching lines @@
   }
   void set_last_engagement_time(const base::Time& time) {
     last_engagement_time_ = time;
   }
 
  private:
   FRIEND_TEST_ALL_PREFIXES(SiteEngagementScoreTest, FirstDailyEngagementBonus);
   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;
 
   using ParamValues = std::array<std::pair<std::string, double>, MAX_VARIATION>;
 
   // Array holding the values corresponding to each item in Variation array.
   static ParamValues& GetParamValues();
   static ParamValues BuildParamValues();
 
   // Keys used in the content settings dictionary.
   static const char* kRawScoreKey;
   static const char* kPointsAddedTodayKey;
   static const char* kLastEngagementTimeKey;
   static const char* kLastShortcutLaunchTimeKey;
 
   // This version of the constructor is used in unit tests.
   SiteEngagementScore(base::Clock* clock,
                       const GURL& origin,
                       std::unique_ptr<base::DictionaryValue> score_dict);
 
   // Determine the score, accounting for any decay.
   double DecayedScore() const;
 
   // 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);
 
   // The clock used to vend times. Enables time travelling in tests. Owned by
   // the SiteEngagementService.
   base::Clock* clock_;
 
   // |raw_score_| is the score before any decay is applied.
   double raw_score_;
@@ skipping 17 matching lines @@
   // The origin this score represents.
   GURL origin_;
 
   // The settings to write this score to when Commit() is called.
   HostContentSettingsMap* settings_map_;
 
   DISALLOW_COPY_AND_ASSIGN(SiteEngagementScore);
 };
 
 #endif  // CHROME_BROWSER_ENGAGEMENT_SITE_ENGAGEMENT_SCORE_H_