Revert of Implement a site engagement score based on time-on-site.

chrome/browser/engagement/site_engagement_service.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 <algorithm>
 #include <cmath>
 
 #include "base/command_line.h"
@@ skipping 40 matching lines @@
 }
 
 }  // namespace
 
 const char* SiteEngagementScore::kRawScoreKey = "rawScore";
 const char* SiteEngagementScore::kPointsAddedTodayKey = "pointsAddedToday";
 const char* SiteEngagementScore::kLastEngagementTimeKey = "lastEngagementTime";
 
 const double SiteEngagementScore::kMaxPoints = 100;
 const double SiteEngagementScore::kMaxPointsPerDay = 5;
-const double SiteEngagementScore::kNavigationPoints = 0.5;
-const double SiteEngagementScore::kUserInputPoints = 0.05;
+const double SiteEngagementScore::kNavigationPoints = 1;
 const int SiteEngagementScore::kDecayPeriodInDays = 7;
 const double SiteEngagementScore::kDecayPoints = 5;
 
 SiteEngagementScore::SiteEngagementScore(
     base::Clock* clock,
     const base::DictionaryValue& score_dict)
     : SiteEngagementScore(clock) {
   score_dict.GetDouble(kRawScoreKey, &raw_score_);
   score_dict.GetDouble(kPointsAddedTodayKey, &points_added_today_);
   double internal_time;
@@ skipping 88 matching lines @@
       switches::kEnableSiteEngagementService);
 }
 
 SiteEngagementService::SiteEngagementService(Profile* profile)
     : profile_(profile) {
 }
 
 SiteEngagementService::~SiteEngagementService() {
 }
 
-void SiteEngagementService::HandleNavigation(const GURL& url,
-                                             ui::PageTransition transition) {
-  AddPoints(url, SiteEngagementScore::kNavigationPoints);
+void SiteEngagementService::HandleNavigation(const GURL& url) {
+  HostContentSettingsMap* settings_map =
+    HostContentSettingsMapFactory::GetForProfile(profile_);
+  scoped_ptr<base::DictionaryValue> score_dict =
+      GetScoreDictForOrigin(settings_map, url);
+  SiteEngagementScore score(&clock_, *score_dict);
+
+  score.AddPoints(SiteEngagementScore::kNavigationPoints);
+  if (score.UpdateScoreDict(score_dict.get())) {
+    ContentSettingsPattern pattern(
+        ContentSettingsPattern::FromURLNoWildcard(url));
+    if (!pattern.IsValid())
+      return;
+
+    settings_map->SetWebsiteSetting(pattern, ContentSettingsPattern::Wildcard(),
+                                    CONTENT_SETTINGS_TYPE_SITE_ENGAGEMENT,
+                                    std::string(), score_dict.release());
+  }
 }
 
-void SiteEngagementService::HandleUserInput(const GURL& url) {
-  AddPoints(url, SiteEngagementScore::kUserInputPoints);
-}
-
-double SiteEngagementService::GetScore(const GURL& url) {
+int SiteEngagementService::GetScore(const GURL& url) {
   HostContentSettingsMap* settings_map =
     HostContentSettingsMapFactory::GetForProfile(profile_);
   scoped_ptr<base::DictionaryValue> score_dict =
       GetScoreDictForOrigin(settings_map, url);
   SiteEngagementScore score(&clock_, *score_dict);
 
   return score.Score();
 }
 
-double SiteEngagementService::GetTotalEngagementPoints() {
+int SiteEngagementService::GetTotalEngagementPoints() {
   HostContentSettingsMap* settings_map =
     HostContentSettingsMapFactory::GetForProfile(profile_);
   ContentSettingsForOneType engagement_settings;
   settings_map->GetSettingsForOneType(CONTENT_SETTINGS_TYPE_SITE_ENGAGEMENT,
                                       std::string(), &engagement_settings);
-  double total_score = 0;
+  int total_score = 0;
   for (const auto& site : engagement_settings) {
     GURL origin(site.primary_pattern.ToString());
     if (!origin.is_valid())
       continue;
 
     scoped_ptr<base::DictionaryValue> score_dict =
         GetScoreDictForOrigin(settings_map, origin);
     SiteEngagementScore score(&clock_, *score_dict);
     total_score += score.Score();
   }
   return total_score;
 }
 
-std::map<GURL, double> SiteEngagementService::GetScoreMap() {
-  std::map<GURL, double> score_map;
+std::map<GURL, int> SiteEngagementService::GetScoreMap() {
+  std::map<GURL, int> score_map;
   HostContentSettingsMap* settings_map =
       HostContentSettingsMapFactory::GetForProfile(profile_);
   ContentSettingsForOneType engagement_settings;
   settings_map->GetSettingsForOneType(CONTENT_SETTINGS_TYPE_SITE_ENGAGEMENT,
                                       std::string(), &engagement_settings);
   for (const auto& site : engagement_settings) {
     GURL origin(site.primary_pattern.ToString());
     if (!origin.is_valid())
       continue;
 
     scoped_ptr<base::DictionaryValue> score_dict =
         GetScoreDictForOrigin(settings_map, origin);
     SiteEngagementScore score(&clock_, *score_dict);
     score_map[origin] = score.Score();
   }
   return score_map;
 }
-
-void SiteEngagementService::AddPoints(const GURL& url, double points) {
-  HostContentSettingsMap* settings_map =
-    HostContentSettingsMapFactory::GetForProfile(profile_);
-  scoped_ptr<base::DictionaryValue> score_dict =
-      GetScoreDictForOrigin(settings_map, url);
-  SiteEngagementScore score(&clock_, *score_dict);
-
-  score.AddPoints(points);
-  if (score.UpdateScoreDict(score_dict.get())) {
-    ContentSettingsPattern pattern(
-        ContentSettingsPattern::FromURLNoWildcard(url));
-    if (!pattern.IsValid())
-      return;
-
-    settings_map->SetWebsiteSetting(pattern, ContentSettingsPattern::Wildcard(),
-                                    CONTENT_SETTINGS_TYPE_SITE_ENGAGEMENT,
-                                    std::string(), score_dict.release());
-  }
-}