Removed Profile::GetHostContentSettingsMap

chrome/browser/engagement/site_engagement_service.cc

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 5f36f19ba525753cb54e04c913119451d858a8fa..332bb338f127714ee2f2b14baeaac76a18ed9aba 100644
--- a/chrome/browser/engagement/site_engagement_service.cc
+++ b/chrome/browser/engagement/site_engagement_service.cc
@@ -10,6 +10,7 @@
 #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.

@@ -168,7 +169,8 @@ 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);
@@ -187,7 +189,8 @@ void SiteEngagementService::HandleNavigation(const GURL& url) {
 }
 
 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);
@@ -196,7 +199,8 @@ int SiteEngagementService::GetScore(const GURL& url) {
 }
 
 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);