chrome/browser/browsing_data/cookies_tree_model_unittest.cc - Issue 1895993003: Add migration code to change existing domain scoped content settings to be origin scoped

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/browsing_data/cookies_tree_model_unittest.cc

Issue 1895993003: Add migration code to change existing domain scoped content settings to be origin scoped (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: remove logs and format Created 4 years, 6 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 | « no previous file | chrome/browser/content_settings/host_content_settings_map_unittest.cc » ('j') | components/content_settings/core/browser/content_settings_registry.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/browsing_data/cookies_tree_model_unittest.cc

diff --git a/chrome/browser/browsing_data/cookies_tree_model_unittest.cc b/chrome/browser/browsing_data/cookies_tree_model_unittest.cc

index 117049093cfcdcd3e0a05d68d83fda7ead157de0..20b2b5eafedbe7bc916f6621392d261775c670d2 100644

--- a/chrome/browser/browsing_data/cookies_tree_model_unittest.cc

+++ b/chrome/browser/browsing_data/cookies_tree_model_unittest.cc

@@ -1429,10 +1429,11 @@ TEST_F(CookiesTreeModelTest, ContentSettings) {

EXPECT_EQ(1, origin->child_count());

EXPECT_TRUE(origin->CanCreateContentException());

- EXPECT_CALL(observer, OnContentSettingsChanged(

- content_settings, CONTENT_SETTINGS_TYPE_COOKIES,

- false, ContentSettingsPattern::FromURL(host),

- ContentSettingsPattern::Wildcard(), false))

+ EXPECT_CALL(observer,

+ OnContentSettingsChanged(

+ content_settings, CONTENT_SETTINGS_TYPE_COOKIES, false,

+ ContentSettingsPattern::FromURLNoWildcard(host),

+ ContentSettingsPattern::Wildcard(), false))

.Times(2);

origin->CreateContentException(

cookie_settings, CONTENT_SETTING_SESSION_ONLY);