Removed Profile::GetHostContentSettingsMap

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"
 #include "base/time/clock.h"
 #include "base/values.h"
+#include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/engagement/site_engagement_helper.h"
 #include "chrome/browser/engagement/site_engagement_service_factory.h"
 #include "chrome/browser/profiles/profile.h"

[benwells, 2015/09/14 03:50:05]

Nit: I think you should be able to remove this include now (and maybe in other
files), which would be nice.

 #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 "url/gurl.h"
 
 namespace {
 
 // Delta within which to consider scores equal.
 const double kScoreDelta = 0.001;
 
@@ skipping 135 matching lines @@
 }
 
 SiteEngagementService::SiteEngagementService(Profile* profile)
     : profile_(profile) {
 }
 
 SiteEngagementService::~SiteEngagementService() {
 }
 
 void SiteEngagementService::HandleNavigation(const GURL& url) {
-  HostContentSettingsMap* settings_map = profile_->GetHostContentSettingsMap();
+  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());
   }
 }
 
 int SiteEngagementService::GetScore(const GURL& url) {
-  HostContentSettingsMap* settings_map = profile_->GetHostContentSettingsMap();
+  HostContentSettingsMap* settings_map =
+    HostContentSettingsMapFactory::GetForProfile(profile_);
   scoped_ptr<base::DictionaryValue> score_dict =
       GetScoreDictForOrigin(settings_map, url);
   SiteEngagementScore score(&clock_, *score_dict);
 
   return score.Score();
 }
 
 int SiteEngagementService::GetTotalEngagementPoints() {
-  HostContentSettingsMap* settings_map = profile_->GetHostContentSettingsMap();
+  HostContentSettingsMap* settings_map =
+    HostContentSettingsMapFactory::GetForProfile(profile_);
   ContentSettingsForOneType engagement_settings;
   settings_map->GetSettingsForOneType(CONTENT_SETTINGS_TYPE_SITE_ENGAGEMENT,
                                       std::string(), &engagement_settings);
   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;
 }