| Index: chrome/browser/prerender/prerender_browsertest.cc
|
| diff --git a/chrome/browser/prerender/prerender_browsertest.cc b/chrome/browser/prerender/prerender_browsertest.cc
|
| index 12f1b7da0589c7345479796a2eb7da0c01519a3f..9c85eec6a9bfdabe704344a87e619f1547cdb5ad 100644
|
| --- a/chrome/browser/prerender/prerender_browsertest.cc
|
| +++ b/chrome/browser/prerender/prerender_browsertest.cc
|
| @@ -28,6 +28,7 @@
|
| #include "chrome/browser/browsing_data/browsing_data_remover_test_util.h"
|
| #include "chrome/browser/chrome_content_browser_client.h"
|
| #include "chrome/browser/chrome_notification_types.h"
|
| +#include "chrome/browser/content_settings/host_content_settings_map_factory.h"
|
| #include "chrome/browser/extensions/api/web_navigation/web_navigation_api.h"
|
| #include "chrome/browser/extensions/extension_apitest.h"
|
| #include "chrome/browser/external_protocol/external_protocol_handler.h"
|
| @@ -1997,7 +1998,8 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderDelayLoadPlugin) {
|
| // a page is being preloaded, but are loaded when the page is displayed.
|
| IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderContentSettingDetect) {
|
| HostContentSettingsMap* content_settings_map =
|
| - current_browser()->profile()->GetHostContentSettingsMap();
|
| + HostContentSettingsMapFactory::GetForProfile(
|
| + current_browser()->profile());
|
| content_settings_map->SetDefaultContentSetting(
|
| CONTENT_SETTINGS_TYPE_PLUGINS, CONTENT_SETTING_DETECT_IMPORTANT_CONTENT);
|
|
|
| @@ -2016,7 +2018,8 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderContentSettingDetect) {
|
| // For Content Setting BLOCK, checks that plugins are never loaded.
|
| IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderContentSettingBlock) {
|
| HostContentSettingsMap* content_settings_map =
|
| - current_browser()->profile()->GetHostContentSettingsMap();
|
| + HostContentSettingsMapFactory::GetForProfile(
|
| + current_browser()->profile());
|
| content_settings_map->SetDefaultContentSetting(CONTENT_SETTINGS_TYPE_PLUGINS,
|
| CONTENT_SETTING_BLOCK);
|
|
|
|
|