[HBD] Gate the advertising of Flash on Site Engagement.

chrome/browser/engagement/site_engagement_score.cc

Index: chrome/browser/engagement/site_engagement_score.cc
diff --git a/chrome/browser/engagement/site_engagement_score.cc b/chrome/browser/engagement/site_engagement_score.cc
index 72d1d3f35cba1771e53106a6ff2493926e2d0e09..6d8e4325acf9f57b0c7c3006c2717a0844a2685c 100644
--- a/chrome/browser/engagement/site_engagement_score.cc
+++ b/chrome/browser/engagement/site_engagement_score.cc
@@ -13,7 +13,6 @@
 #include "base/values.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/engagement/site_engagement_metrics.h"
-#include "chrome/browser/profiles/profile.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/variations/variations_associated_data.h"
 
@@ -35,33 +34,18 @@ bool DoublesConsideredDifferent(double value1, double value2, double delta) {
   return abs_difference > delta;
 }
 
-std::unique_ptr<base::DictionaryValue> GetScoreDictForOrigin(
-    Profile* profile,
+std::unique_ptr<base::DictionaryValue> GetScoreDictForSettings(
+    const HostContentSettingsMap* settings,
     const GURL& origin_url) {
-  HostContentSettingsMap* settings =
-      HostContentSettingsMapFactory::GetForProfile(profile);
-  HostContentSettingsMap* fallback_settings =
-      profile->IsOffTheRecord() ? HostContentSettingsMapFactory::GetForProfile(
-                                      profile->GetOriginalProfile())
-                                : nullptr;
-
   if (!settings)
-    return std::unique_ptr<base::DictionaryValue>();
+    return base::MakeUnique<base::DictionaryValue>();
 
   std::unique_ptr<base::Value> value = settings->GetWebsiteSetting(
       origin_url, origin_url, CONTENT_SETTINGS_TYPE_SITE_ENGAGEMENT,
       std::string(), NULL);
-  if (!value.get() && fallback_settings) {
-    value = fallback_settings->GetWebsiteSetting(
-        origin_url, origin_url, CONTENT_SETTINGS_TYPE_SITE_ENGAGEMENT,
-        std::string(), NULL);
-  }
-
-  if (!value.get())
-    return base::WrapUnique(new base::DictionaryValue());
 
-  if (!value->IsType(base::Value::TYPE_DICTIONARY))
-    return base::WrapUnique(new base::DictionaryValue());
+  if (!value.get() || !value->IsType(base::Value::TYPE_DICTIONARY))
+    return base::MakeUnique<base::DictionaryValue>();
 
   return base::WrapUnique(static_cast<base::DictionaryValue*>(value.release()));
 }
@@ -192,12 +176,15 @@ void SiteEngagementScore::UpdateFromVariations(const char* param_name) {
     SiteEngagementScore::GetParamValues()[i].second = param_vals[i];
 }
 
-SiteEngagementScore::SiteEngagementScore(base::Clock* clock,
-                                         const GURL& origin,
-                                         Profile* profile)
-    : SiteEngagementScore(clock, GetScoreDictForOrigin(profile, origin)) {
-  origin_ = origin;
-  profile_ = profile;
+SiteEngagementScore::SiteEngagementScore(
+    base::Clock* clock,
+    const GURL& origin,
+    HostContentSettingsMap* settings)
+    : SiteEngagementScore(
+          clock,
+          origin,
+          GetScoreDictForSettings(settings, origin)) {
+  settings_map_ = settings;
 }
 
 SiteEngagementScore::SiteEngagementScore(SiteEngagementScore&& other) = default;
@@ -249,13 +236,12 @@ double SiteEngagementScore::GetScore() const {
 }
 
 void SiteEngagementScore::Commit() {
-  if (!UpdateScoreDict(score_dict_.get()))
+  if (!UpdateScoreDict(score_dict_.get()) || !settings_map_)

[calamity, 2016/09/13 04:14:37]

Is the settings_map_ ever null? We may want to DCHECK it instead.

[dominickn, 2016/09/13 04:42:14]

It could be nullptr in tests (where it uses the private constructor that doesn't
initialize settings_map_). The constructor also doesn't assume that it gets a
non-nullptr (e.g the nullptr check in GetScoreDictForSettings).

Unless we mandate that a non-null pointer is passed in during tests as well, I
don't think that it makes sense to DCHECK here, since you could legitimately
create a SiteEngagementScore using a nullptr. Otherwise, we should go the whole
hog and enforce a non-nullptr settings_map_ - including in the private
constructor. That makes SiteEngagementScore tests more complicated (that class
would probably need to be converted to subclass ChromeRenderViewHostTestHarness
so that there's a profile() etc. around).

[calamity, 2016/09/13 06:33:34]

To me, the condition the DCHECK here enforces is 'You shouldn't be calling
Commit() without a settings map'. The existing tests don't do this, and future
tests never should. I think it would be a useful tripwire that we can remove
later if it proves to be inconvenient.

[dominickn, 2016/09/14 01:06:55]

Done.

     return;
 
-  HostContentSettingsMapFactory::GetForProfile(profile_)
-      ->SetWebsiteSettingDefaultScope(origin_, GURL(),
-                                      CONTENT_SETTINGS_TYPE_SITE_ENGAGEMENT,
-                                      std::string(), std::move(score_dict_));
+  settings_map_->SetWebsiteSettingDefaultScope(
+      origin_, GURL(), CONTENT_SETTINGS_TYPE_SITE_ENGAGEMENT, std::string(),
+      std::move(score_dict_));
 }
 
 bool SiteEngagementScore::MaxPointsPerDayAdded() const {
@@ -314,13 +300,15 @@ bool SiteEngagementScore::UpdateScoreDict(base::DictionaryValue* score_dict) {
 
 SiteEngagementScore::SiteEngagementScore(
     base::Clock* clock,
+    const GURL& origin,
     std::unique_ptr<base::DictionaryValue> score_dict)
     : clock_(clock),
       raw_score_(0),
       points_added_today_(0),
       last_engagement_time_(),
       last_shortcut_launch_time_(),
-      score_dict_(score_dict.release()) {
+      score_dict_(score_dict.release()),
+      origin_(origin) {
   if (!score_dict_)
     return;