Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(844)

Unified Diff: chrome/browser/engagement/site_engagement_service.cc

Issue 1363523003: Enable SiteEngagementEvictionPolicy behind --enable-site-eviction-policy flag. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lru_policy_gooood
Patch Set: fix flag dependencies Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/engagement/site_engagement_service.cc
diff --git a/chrome/browser/engagement/site_engagement_service.cc b/chrome/browser/engagement/site_engagement_service.cc
index 9e7798cd6dc77adce456d32667de46076d3a7149..afbc1472d2b717aa28297b992a245683b934f57c 100644
--- a/chrome/browser/engagement/site_engagement_service.cc
+++ b/chrome/browser/engagement/site_engagement_service.cc
@@ -15,6 +15,7 @@
#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"
@@ -250,16 +251,20 @@ SiteEngagementService* SiteEngagementService::Get(Profile* 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);
}

Powered by Google App Engine
This is Rietveld 408576698