Removed Profile::GetHostContentSettingsMap

chrome/browser/banners/app_banner_settings_helper.cc

 // Copyright 2014 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/banners/app_banner_settings_helper.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "chrome/browser/banners/app_banner_data_fetcher.h"
 #include "chrome/browser/banners/app_banner_metrics.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/profiles/profile.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/rappor/rappor_utils.h"
 #include "content/public/browser/web_contents.h"
 #include "net/base/escape.h"
 #include "url/gurl.h"
 
 namespace {
@@ skipping 128 matching lines @@
   int minimum_minutes = 0;
   if (base::StringToInt(minutes_between_visits, &minimum_minutes))
     AppBannerSettingsHelper::SetMinimumMinutesBetweenVisits(minimum_minutes);
 }
 
 }  // namespace
 
 void AppBannerSettingsHelper::ClearHistoryForURLs(
     Profile* profile,
     const std::set<GURL>& origin_urls) {
-  HostContentSettingsMap* settings = profile->GetHostContentSettingsMap();
+  HostContentSettingsMap* settings =
+      HostContentSettingsMapFactory::GetForProfile(profile);
   for (const GURL& origin_url : origin_urls) {
     ContentSettingsPattern pattern(ContentSettingsPattern::FromURL(origin_url));
     if (!pattern.IsValid())
       continue;
 
     settings->SetWebsiteSetting(pattern, ContentSettingsPattern::Wildcard(),
                                 CONTENT_SETTINGS_TYPE_APP_BANNER, std::string(),
                                 nullptr);
     settings->FlushLossyWebsiteSettings();
   }
@@ skipping 47 matching lines @@
 
   Profile* profile =
       Profile::FromBrowserContext(web_contents->GetBrowserContext());
   if (profile->IsOffTheRecord() || package_name_or_start_url.empty())
     return;
 
   ContentSettingsPattern pattern(ContentSettingsPattern::FromURL(origin_url));
   if (!pattern.IsValid())
     return;
 
-  HostContentSettingsMap* settings = profile->GetHostContentSettingsMap();
+  HostContentSettingsMap* settings =
+      HostContentSettingsMapFactory::GetForProfile(profile);
   scoped_ptr<base::DictionaryValue> origin_dict =
       GetOriginDict(settings, origin_url);
   if (!origin_dict)
     return;
 
   base::DictionaryValue* app_dict =
       GetAppDict(origin_dict.get(), package_name_or_start_url);
   if (!app_dict)
     return;
 
@@ skipping 23 matching lines @@
     ui::PageTransition transition_type) {
   Profile* profile =
       Profile::FromBrowserContext(web_contents->GetBrowserContext());
   if (profile->IsOffTheRecord() || package_name_or_start_url.empty())
     return;
 
   ContentSettingsPattern pattern(ContentSettingsPattern::FromURL(origin_url));
   if (!pattern.IsValid())
     return;
 
-  HostContentSettingsMap* settings = profile->GetHostContentSettingsMap();
+  HostContentSettingsMap* settings =
+      HostContentSettingsMapFactory::GetForProfile(profile);
   scoped_ptr<base::DictionaryValue> origin_dict =
       GetOriginDict(settings, origin_url);
   if (!origin_dict)
     return;
 
   base::DictionaryValue* app_dict =
       GetAppDict(origin_dict.get(), package_name_or_start_url);
   if (!app_dict)
     return;
 
@@ skipping 121 matching lines @@
 AppBannerSettingsHelper::GetCouldShowBannerEvents(
     content::WebContents* web_contents,
     const GURL& origin_url,
     const std::string& package_name_or_start_url) {
   std::vector<BannerEvent> result;
   if (package_name_or_start_url.empty())
     return result;
 
   Profile* profile =
       Profile::FromBrowserContext(web_contents->GetBrowserContext());
-  HostContentSettingsMap* settings = profile->GetHostContentSettingsMap();
+  HostContentSettingsMap* settings =
+      HostContentSettingsMapFactory::GetForProfile(profile);
   scoped_ptr<base::DictionaryValue> origin_dict =
       GetOriginDict(settings, origin_url);
 
   if (!origin_dict)
     return result;
 
   base::DictionaryValue* app_dict =
       GetAppDict(origin_dict.get(), package_name_or_start_url);
   if (!app_dict)
     return result;
@@ skipping 27 matching lines @@
     const std::string& package_name_or_start_url,
     AppBannerEvent event) {
   DCHECK(event != APP_BANNER_EVENT_COULD_SHOW);
   DCHECK(event < APP_BANNER_EVENT_NUM_EVENTS);
 
   if (package_name_or_start_url.empty())
     return base::Time();
 
   Profile* profile =
       Profile::FromBrowserContext(web_contents->GetBrowserContext());
-  HostContentSettingsMap* settings = profile->GetHostContentSettingsMap();
+  HostContentSettingsMap* settings =
+      HostContentSettingsMapFactory::GetForProfile(profile);
   scoped_ptr<base::DictionaryValue> origin_dict =
       GetOriginDict(settings, origin_url);
 
   if (!origin_dict)
     return base::Time();
 
   base::DictionaryValue* app_dict =
       GetAppDict(origin_dict.get(), package_name_or_start_url);
   if (!app_dict)
     return base::Time();
@@ skipping 45 matching lines @@
 
   // Use truncating integer division here.
   return time.LocalMidnight() +
          base::TimeDelta::FromMinutes((total_minutes / minutes) * minutes);
 }
 
 void AppBannerSettingsHelper::UpdateFromFieldTrial() {
   UpdateEngagementWeights();
   UpdateMinutesBetweenVisits();
 }