Removed Profile::GetHostContentSettingsMap

chrome/browser/ui/blocked_content/popup_blocker_tab_helper.cc

 // Copyright 2013 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/ui/blocked_content/popup_blocker_tab_helper.h"
 
 #include "chrome/browser/chrome_notification_types.h"
+#include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/blocked_content/blocked_window_params.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/render_messages.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_entry.h"
@@ skipping 62 matching lines @@
   // entry is the page to be loaded as we navigate away from the unloading
   // page.  For this reason, we can't use GetURL() to get the opener URL,
   // because it returns the active entry.
   content::NavigationEntry* entry =
       web_contents()->GetController().GetLastCommittedEntry();
   GURL creator = entry ? entry->GetVirtualURL() : GURL();
   Profile* profile =
       Profile::FromBrowserContext(web_contents()->GetBrowserContext());
 
   if (creator.is_valid() &&
-      profile->GetHostContentSettingsMap()->GetContentSetting(
+      HostContentSettingsMapFactory::GetForProfile(profile)->GetContentSetting(
           creator, creator, CONTENT_SETTINGS_TYPE_POPUPS, std::string()) ==
           CONTENT_SETTING_ALLOW) {
     return false;
   } else {
     if (blocked_popups_.size() < kMaximumNumberOfPopups) {
       blocked_popups_.Add(new BlockedRequest(params, window_features));
       TabSpecificContentSettings::FromWebContents(web_contents())->
           OnContentBlocked(CONTENT_SETTINGS_TYPE_POPUPS);
     }
     return true;
@@ skipping 39 matching lines @@
     PopupBlockerTabHelper::GetBlockedPopupRequests() {
   PopupIdMap result;
   for (IDMap<BlockedRequest, IDMapOwnPointer>::const_iterator iter(
            &blocked_popups_);
        !iter.IsAtEnd();
        iter.Advance()) {
     result[iter.GetCurrentKey()] = iter.GetCurrentValue()->params.url;
   }
   return result;
 }