chrome/browser/profile_resetter/profile_resetter.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/profile_resetter/profile_resetter.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:

Index: chrome/browser/profile_resetter/profile_resetter.cc

diff --git a/chrome/browser/profile_resetter/profile_resetter.cc b/chrome/browser/profile_resetter/profile_resetter.cc

index acdecdd30e3069ec084f45a7258cf486ad73af52..071b15e869995492ba1aa108ede7da9b9dab8357 100644

--- a/chrome/browser/profile_resetter/profile_resetter.cc

+++ b/chrome/browser/profile_resetter/profile_resetter.cc

@@ -10,6 +10,7 @@

#include "base/prefs/scoped_user_pref_update.h"

#include "base/synchronization/cancellation_flag.h"

#include "chrome/browser/browsing_data/browsing_data_helper.h"

+#include "chrome/browser/content_settings/host_content_settings_map_factory.h"

#include "chrome/browser/extensions/extension_service.h"

#include "chrome/browser/google/google_url_tracker_factory.h"

#include "chrome/browser/profile_resetter/brandcoded_default_settings.h"

@@ -218,7 +219,8 @@ void ProfileResetter::ResetHomepage() {

void ProfileResetter::ResetContentSettings() {

DCHECK(CalledOnValidThread());

PrefService* prefs = profile_->GetPrefs();

- HostContentSettingsMap* map = profile_->GetHostContentSettingsMap();

+ HostContentSettingsMap* map =

+ HostContentSettingsMapFactory::GetForProfile(profile_);

content_settings::WebsiteSettingsRegistry* registry =

content_settings::WebsiteSettingsRegistry::GetInstance();