chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc - Issue 1312453005: Removed Profile::GetHostContentSettingsMap

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc

Issue 1312453005: Removed Profile::GetHostContentSettingsMap (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed patch conflict Created 5 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/content_settings/content_setting_image_model.cc ('k') | chrome/browser/ui/exclusive_access/fullscreen_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc

diff --git a/chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc b/chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc

index 7b533ff587355fc22a0a87fb3c6eabd2cac6a5a8..10b63bd5c66e431423b3bb337dcd84132452474a 100644

--- a/chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc

+++ b/chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc

@@ -4,6 +4,7 @@

#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/prerender/prerender_manager.h"

#include "chrome/browser/profiles/profile.h"

@@ -95,8 +96,9 @@ TEST_F(ContentSettingImageModelTest, CookieAccessed) {

TabSpecificContentSettings::CreateForWebContents(web_contents());

TabSpecificContentSettings* content_settings =

TabSpecificContentSettings::FromWebContents(web_contents());

- profile()->GetHostContentSettingsMap()->SetDefaultContentSetting(

- CONTENT_SETTINGS_TYPE_COOKIES, CONTENT_SETTING_BLOCK);

+ HostContentSettingsMapFactory::GetForProfile(profile())

+ ->SetDefaultContentSetting(CONTENT_SETTINGS_TYPE_COOKIES,

+ CONTENT_SETTING_BLOCK);

scoped_ptr<ContentSettingImageModel> content_setting_image_model(

ContentSettingImageModel::CreateContentSettingImageModel(

CONTENT_SETTINGS_TYPE_COOKIES));