Enable SiteEngagementEvictionPolicy behind --enable-site-eviction-policy flag.

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 <vector>
 
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/time/clock.h"
 #include "base/time/default_clock.h"
 #include "base/values.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
+#include "chrome/browser/engagement/site_engagement_eviction_policy.h"
 #include "chrome/browser/engagement/site_engagement_helper.h"
 #include "chrome/browser/engagement/site_engagement_service_factory.h"
 #include "chrome/common/chrome_switches.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/content_settings/core/common/content_settings_pattern.h"
 #include "components/variations/variations_associated_data.h"
 #include "content/public/browser/browser_thread.h"
 #include "url/gurl.h"
 
 namespace {
 
 // Global bool to ensure we only update the parameters from variations once.
 bool g_updated_from_variations = false;
 
 // Keys used in the variations params.
-const char kEngagementParams[] = "SiteEngagement";
 const char kMaxPointsPerDayParam[] = "max_points_per_day";
 const char kNavigationPointsParam[] = "navigation_points";
 const char kUserInputPointsParam[] = "user_input_points";
 const char kDecayPeriodInDaysParam[] = "decay_period_in_days";
 const char kDecayPointsParam[] = "decay_points";
 
 // Length of time between metrics logging.
 const base::TimeDelta metrics_interval = base::TimeDelta::FromMinutes(60);
 
 // Delta within which to consider scores equal.
@@ skipping 59 matching lines @@
 double SiteEngagementScore::g_user_input_points = 0.05;
 int SiteEngagementScore::g_decay_period_in_days = 7;
 double SiteEngagementScore::g_decay_points = 5;
 
 const char* SiteEngagementScore::kRawScoreKey = "rawScore";
 const char* SiteEngagementScore::kPointsAddedTodayKey = "pointsAddedToday";
 const char* SiteEngagementScore::kLastEngagementTimeKey = "lastEngagementTime";
 
 void SiteEngagementScore::UpdateFromVariations() {
   std::string max_points_per_day_param = variations::GetVariationParamValue(
-      kEngagementParams, kMaxPointsPerDayParam);
+      SiteEngagementService::kEngagementParams, kMaxPointsPerDayParam);
   std::string navigation_points_param = variations::GetVariationParamValue(
-      kEngagementParams, kNavigationPointsParam);
+      SiteEngagementService::kEngagementParams, kNavigationPointsParam);
   std::string user_input_points_param = variations::GetVariationParamValue(
-      kEngagementParams, kUserInputPointsParam);
+      SiteEngagementService::kEngagementParams, kUserInputPointsParam);
   std::string decay_period_in_days_param = variations::GetVariationParamValue(
-      kEngagementParams, kDecayPeriodInDaysParam);
+      SiteEngagementService::kEngagementParams, kDecayPeriodInDaysParam);
   std::string decay_points_param = variations::GetVariationParamValue(
-      kEngagementParams, kDecayPointsParam);
+      SiteEngagementService::kEngagementParams, kDecayPointsParam);
 
   if (!max_points_per_day_param.empty() && !navigation_points_param.empty() &&
       !user_input_points_param.empty() && !decay_period_in_days_param.empty() &&
       !decay_points_param.empty()) {
     double max_points_per_day = 0;
     double navigation_points = 0;
     double user_input_points = 0;
     int decay_period_in_days = 0;
     double decay_points = 0;
 
@@ skipping 104 matching lines @@
   // applied.
   int days_since_engagement = (clock_->Now() - last_engagement_time_).InDays();
   if (days_since_engagement < 0)
     return raw_score_;
 
   int periods = days_since_engagement / g_decay_period_in_days;
   double decayed_score = raw_score_ - periods * g_decay_points;
   return std::max(0.0, decayed_score);
 }
 
+const char SiteEngagementService::kEngagementParams[] = "SiteEngagement";
+
 // static
 SiteEngagementService* SiteEngagementService::Get(Profile* profile) {
   return SiteEngagementServiceFactory::GetForProfile(profile);
 }
 
 // static
 bool SiteEngagementService::IsEnabled() {
-  const std::string group_name =
-      base::FieldTrialList::FindFullName(kEngagementParams);
+  // If the engagement service or any of its dependencies are force-enabled,
+  // return true immediately.
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kEnableSiteEngagementService)) {
+          switches::kEnableSiteEngagementService) ||
+      SiteEngagementEvictionPolicy::IsEnabled()) {
     return true;
   }
+
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDisableSiteEngagementService)) {
     return false;
   }
+  const std::string group_name =
+      base::FieldTrialList::FindFullName(kEngagementParams);
   return base::StartsWith(group_name, "Enabled", base::CompareCase::SENSITIVE);
 }
 
 // static
 void SiteEngagementService::ClearHistoryForURLs(Profile* profile,
                                                 const std::set<GURL>& origins) {
   HostContentSettingsMap* settings_map =
       HostContentSettingsMapFactory::GetForProfile(profile);
 
   for (const GURL& origin_url : origins) {
@@ skipping 217 matching lines @@
 int SiteEngagementService::OriginsWithMaxEngagement(
     std::map<GURL, double>& score_map) {
   int total_origins = 0;
 
   for (const auto& value : score_map)
     if (value.second == SiteEngagementScore::kMaxPoints)
       ++total_origins;
 
   return total_origins;
 }