Removed Profile::GetHostContentSettingsMap

chrome/browser/content_settings/tab_specific_content_settings.cc

 // Copyright (c) 2012 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/content_settings/tab_specific_content_settings.h"
 
 #include <list>
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browsing_data/browsing_data_appcache_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_cookie_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_database_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_file_system_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_indexed_db_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_local_storage_helper.h"
 #include "chrome/browser/browsing_data/cookies_tree_model.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/content_settings/chrome_content_settings_utils.h"
+#include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/media/media_capture_devices_dispatcher.h"
 #include "chrome/browser/media/media_stream_capture_indicator.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/render_messages.h"
 #include "components/content_settings/content/common/content_settings_messages.h"
 #include "components/content_settings/core/browser/content_settings_details.h"
 #include "components/content_settings/core/browser/content_settings_info.h"
 #include "components/content_settings/core/browser/content_settings_registry.h"
@@ skipping 49 matching lines @@
   tab_specific_content_settings_ = NULL;
 }
 
 TabSpecificContentSettings::TabSpecificContentSettings(WebContents* tab)
     : content::WebContentsObserver(tab),
       allowed_local_shared_objects_(
           Profile::FromBrowserContext(tab->GetBrowserContext())),
       blocked_local_shared_objects_(
           Profile::FromBrowserContext(tab->GetBrowserContext())),
       geolocation_usages_state_(
-          Profile::FromBrowserContext(tab->GetBrowserContext())
-              ->GetHostContentSettingsMap(),
+          HostContentSettingsMapFactory::GetForProfile(
+              Profile::FromBrowserContext(tab->GetBrowserContext())),
           CONTENT_SETTINGS_TYPE_GEOLOCATION,
           prefs::kAcceptLanguages,
           Profile::FromBrowserContext(tab->GetBrowserContext())->GetPrefs()),
       midi_usages_state_(
-          Profile::FromBrowserContext(tab->GetBrowserContext())
-              ->GetHostContentSettingsMap(),
+          HostContentSettingsMapFactory::GetForProfile(
+              Profile::FromBrowserContext(tab->GetBrowserContext())),
           CONTENT_SETTINGS_TYPE_MIDI_SYSEX,
           prefs::kAcceptLanguages,
           Profile::FromBrowserContext(tab->GetBrowserContext())->GetPrefs()),
       pending_protocol_handler_(ProtocolHandler::EmptyProtocolHandler()),
       previous_protocol_handler_(ProtocolHandler::EmptyProtocolHandler()),
       pending_protocol_handler_setting_(CONTENT_SETTING_DEFAULT),
       load_plugins_link_enabled_(true),
       microphone_camera_state_(MICROPHONE_CAMERA_NOT_ACCESSED),
       observer_(this) {
   ClearBlockedContentSettingsExceptForCookies();
   ClearCookieSpecificContentSettings();
 
-  observer_.Add(Profile::FromBrowserContext(tab->GetBrowserContext())
-                    ->GetHostContentSettingsMap());
+  observer_.Add(HostContentSettingsMapFactory::GetForProfile(
+      Profile::FromBrowserContext(tab->GetBrowserContext())));
 }
 
 TabSpecificContentSettings::~TabSpecificContentSettings() {
   FOR_EACH_OBSERVER(
       SiteDataObserver, observer_list_, ContentSettingsDestroyed());
 }
 
 TabSpecificContentSettings* TabSpecificContentSettings::GetForFrame(
     int render_process_id,
     int render_frame_id) {
@@ skipping 581 matching lines @@
   NavigationEntry* entry = controller.GetVisibleEntry();
   GURL entry_url;
   if (entry)
     entry_url = entry->GetURL();
   if (details.update_all() ||
       // The visible NavigationEntry is the URL in the URL field of a tab.
       // Currently this should be matched by the |primary_pattern|.
       details.primary_pattern().Matches(entry_url)) {
     Profile* profile =
         Profile::FromBrowserContext(web_contents()->GetBrowserContext());
-    const HostContentSettingsMap* map = profile->GetHostContentSettingsMap();
+    const HostContentSettingsMap* map =
+        HostContentSettingsMapFactory::GetForProfile(profile);
 
     if (content_type == CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC ||
         content_type == CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA) {
       const GURL media_origin = media_stream_access_origin();
       ContentSetting setting = map->GetContentSetting(media_origin,
                                                       media_origin,
                                                       content_type,
                                                       std::string());
       ContentSettingsStatus& status = content_settings_status_[content_type];
       status.allowed = setting == CONTENT_SETTING_ALLOW;
@@ skipping 90 matching lines @@
 
 void TabSpecificContentSettings::GeolocationDidNavigate(
     const content::LoadCommittedDetails& details) {
   geolocation_usages_state_.DidNavigate(GetCommittedDetails(details));
 }
 
 void TabSpecificContentSettings::MidiDidNavigate(
     const content::LoadCommittedDetails& details) {
   midi_usages_state_.DidNavigate(GetCommittedDetails(details));
 }