chrome/browser/browsing_data/cookies_tree_model_unittest.cc - Issue 2075103002: Change ContentSettingsType's scoping type and hookup migration code

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 2075103002: Change ContentSettingsType's scoping type and hookup migration code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@do_migration_after_sync

Patch Set: rebase Created 4 years, 5 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_factory.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/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 89a237a66fa903cebd2afa50bd0ee24cd31f3a8e..043097ad78d2156887389912e4037e63e1876ab1 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);