chrome/browser/extensions/api/content_settings/content_settings_apitest.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/extensions/api/content_settings/content_settings_apitest.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/extensions/api/content_settings/content_settings_api.cc ('k') | chrome/browser/extensions/extension_special_storage_policy_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/content_settings/content_settings_apitest.cc

diff --git a/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc b/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc

index 8205b1d809d05e4787f05aef90c599970b24727e..bf1389c8bbc344bf0da1806d1aaad2b9ffd81985 100644

--- a/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc

+++ b/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc

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

#include "chrome/browser/browser_process.h"

#include "chrome/browser/chrome_notification_types.h"

#include "chrome/browser/content_settings/cookie_settings_factory.h"

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

#include "chrome/browser/extensions/api/content_settings/content_settings_api.h"

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

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

@@ -72,7 +73,7 @@ class ExtensionContentSettingsApiTest : public ExtensionApiTest {

protected:

void CheckContentSettingsSet() {

HostContentSettingsMap* map =

- profile_->GetHostContentSettingsMap();

+ HostContentSettingsMapFactory::GetForProfile(profile_);

content_settings::CookieSettings* cookie_settings =

CookieSettingsFactory::GetForProfile(profile_).get();

@@ -189,7 +190,7 @@ class ExtensionContentSettingsApiTest : public ExtensionApiTest {

void CheckContentSettingsDefault() {

HostContentSettingsMap* map =

- profile_->GetHostContentSettingsMap();

+ HostContentSettingsMapFactory::GetForProfile(profile_);

content_settings::CookieSettings* cookie_settings =

CookieSettingsFactory::GetForProfile(profile_).get();