chrome/browser/extensions/api/content_settings/content_settings_store_unittest.cc - Issue 1442083002: Stop inheriting push notification permissions from regular to incognito

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_store_unittest.cc

Issue 1442083002: Stop inheriting push notification permissions from regular to incognito (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Move GetContentSettingValueAndPatterns to HostContentSettingsMap, and address other review comments Created 5 years 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/content_settings/host_content_settings_map_unittest.cc ('k') | components/content_settings/core/browser/content_settings_default_provider.cc » ('j') | components/content_settings/core/browser/host_content_settings_map.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 962bead01e0c3d9f145b967e9ec950646df5535d..c9eee95e7480d9ee63745bf46d840e7779ae3248 100644

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

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

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

#include "base/memory/scoped_ptr.h"

#include "components/content_settings/core/browser/content_settings_rule.h"

#include "components/content_settings/core/browser/content_settings_utils.h"

+#include "components/content_settings/core/browser/host_content_settings_map.h"

#include "testing/gmock/include/gmock/gmock.h"

#include "testing/gtest/include/gtest/gtest.h"

#include "url/gurl.h"

@@ -55,7 +56,7 @@ ContentSetting GetContentSettingFromStore(

scoped_ptr<content_settings::RuleIterator> rule_iterator(

store->GetRuleIterator(content_type, resource_identifier, incognito));

scoped_ptr<base::Value> setting(

- content_settings::GetContentSettingValueAndPatterns(

+ HostContentSettingsMap::GetContentSettingValueAndPatternsInternal(

rule_iterator.get(), primary_url, secondary_url, NULL, NULL));

return content_settings::ValueToContentSetting(setting.get());

}