Removed Profile::GetHostContentSettingsMap

chrome/browser/ui/blocked_content/popup_blocker_browsertest.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 "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.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/search_engines/template_url_service_factory.h"
 #include "chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/location_bar/location_bar.h"
@@ skipping 315 matching lines @@
   GURL url(embedded_test_server()->GetURL("/popup_blocker/popup-many.html"));
   ui_test_utils::NavigateToURL(browser(), url);
   ASSERT_EQ(2, GetBlockedContentsCount());
 }
 
 // Verify that popups are launched on browser back button.
 IN_PROC_BROWSER_TEST_F(PopupBlockerBrowserTest,
                        AllowPopupThroughContentSetting) {
   GURL url(embedded_test_server()->GetURL(
       "/popup_blocker/popup-blocked-to-post-blank.html"));
-  browser()->profile()->GetHostContentSettingsMap()
+  HostContentSettingsMapFactory::GetForProfile(browser()->profile())
       ->SetContentSetting(ContentSettingsPattern::FromURL(url),
                           ContentSettingsPattern::Wildcard(),
                           CONTENT_SETTINGS_TYPE_POPUPS,
                           std::string(),
                           CONTENT_SETTING_ALLOW);
 
   NavigateAndCheckPopupShown(url, ExpectTab);
 }
 
 // Verify that content settings are applied based on the top-level frame URL.
 IN_PROC_BROWSER_TEST_F(PopupBlockerBrowserTest,
                        AllowPopupThroughContentSettingIFrame) {
   GURL url(embedded_test_server()->GetURL("/popup_blocker/popup-frames.html"));
-  browser()->profile()->GetHostContentSettingsMap()
+  HostContentSettingsMapFactory::GetForProfile(browser()->profile())
       ->SetContentSetting(ContentSettingsPattern::FromURL(url),
                           ContentSettingsPattern::Wildcard(),
                           CONTENT_SETTINGS_TYPE_POPUPS,
                           std::string(),
                           CONTENT_SETTING_ALLOW);
 
   // Popup from the iframe should be allowed since the top-level URL is
   // whitelisted.
   NavigateAndCheckPopupShown(url, ExpectTab);
 
   // Whitelist iframe URL instead.
   GURL::Replacements replace_host;
   replace_host.SetHostStr("www.a.com");
   GURL frame_url(embedded_test_server()
                      ->GetURL("/popup_blocker/popup-frames-iframe.html")
                      .ReplaceComponents(replace_host));
-  browser()->profile()->GetHostContentSettingsMap()->ClearSettingsForOneType(
-      CONTENT_SETTINGS_TYPE_POPUPS);
-  browser()->profile()->GetHostContentSettingsMap()
+  HostContentSettingsMapFactory::GetForProfile(browser()->profile())
+      ->ClearSettingsForOneType(CONTENT_SETTINGS_TYPE_POPUPS);
+  HostContentSettingsMapFactory::GetForProfile(browser()->profile())
       ->SetContentSetting(ContentSettingsPattern::FromURL(frame_url),
                           ContentSettingsPattern::Wildcard(),
                           CONTENT_SETTINGS_TYPE_POPUPS,
                           std::string(),
                           CONTENT_SETTING_ALLOW);
 
   // Popup should be blocked.
   ui_test_utils::NavigateToURL(browser(), url);
   ASSERT_EQ(1, GetBlockedContentsCount());
 }
@@ skipping 167 matching lines @@
 
   // The popup from the unload event handler should not show up for about:blank.
   ASSERT_EQ(0, GetBlockedContentsCount());
 }
 
 // Verify that app modal prompts can't be used to create pop unders.
 IN_PROC_BROWSER_TEST_F(PopupBlockerBrowserTest, ModalPopUnder) {
   WebContents* tab = browser()->tab_strip_model()->GetActiveWebContents();
   GURL url(
       embedded_test_server()->GetURL("/popup_blocker/popup-window-open.html"));
-  browser()->profile()->GetHostContentSettingsMap()->SetContentSetting(
-      ContentSettingsPattern::FromURL(url), ContentSettingsPattern::Wildcard(),
-      CONTENT_SETTINGS_TYPE_POPUPS, std::string(), CONTENT_SETTING_ALLOW);
+  HostContentSettingsMapFactory::GetForProfile(browser()->profile())
+      ->SetContentSetting(ContentSettingsPattern::FromURL(url),
+                          ContentSettingsPattern::Wildcard(),
+                          CONTENT_SETTINGS_TYPE_POPUPS,
+                          std::string(),
+                          CONTENT_SETTING_ALLOW);
 
   NavigateAndCheckPopupShown(url, ExpectPopup);
 
   Browser* popup_browser =
       chrome::FindLastActiveWithHostDesktopType(browser()->host_desktop_type());
   ASSERT_NE(popup_browser, browser());
 
   // Showing an alert will raise the tab over the popup.
   tab->GetMainFrame()->ExecuteJavaScriptForTests(base::UTF8ToUTF16("alert()"));
   app_modal::AppModalDialog* dialog = ui_test_utils::WaitForAppModalDialog();
@@ skipping 123 matching lines @@
   wait_for_new_tab.Wait();
 
   ASSERT_EQ(1u, chrome::GetBrowserCount(browser()->profile(),
                                         browser()->host_desktop_type()));
   ASSERT_EQ(2, browser()->tab_strip_model()->count());
   // Check that we create the background tab.
   ASSERT_EQ(0, browser()->tab_strip_model()->active_index());
 }
 
 }  // namespace