chrome/browser/content_settings/content_settings_browsertest.cc - Issue 1694063002: Use GURLS instead of patterns in SetCookieSetting()

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/content_settings/content_settings_browsertest.cc

Issue 1694063002: Use GURLS instead of patterns in SetCookieSetting() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scoping_set_content_setting

Patch Set: remove unused patterns Created 4 years, 9 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/browsing_data/cookies_tree_model.cc ('k') | chrome/browser/content_settings/cookie_settings_factory_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/content_settings/content_settings_browsertest.cc

diff --git a/chrome/browser/content_settings/content_settings_browsertest.cc b/chrome/browser/content_settings/content_settings_browsertest.cc

index 65ecc142d4c16418869ba7dd5a19be216ac7bd6b..7af3c5dfb73abf1163eb9239a775cbdedca78489 100644

--- a/chrome/browser/content_settings/content_settings_browsertest.cc

+++ b/chrome/browser/content_settings/content_settings_browsertest.cc

@@ -166,9 +166,7 @@ IN_PROC_BROWSER_TEST_F(ContentSettingsTest, AllowCookiesUsingExceptions) {

ui_test_utils::NavigateToURL(browser(), url);

ASSERT_TRUE(GetCookies(browser()->profile(), url).empty());

- settings->SetCookieSetting(

- ContentSettingsPattern::FromURL(url),

- ContentSettingsPattern::Wildcard(), CONTENT_SETTING_ALLOW);

+ settings->SetCookieSetting(url, CONTENT_SETTING_ALLOW);

ui_test_utils::NavigateToURL(browser(), url);

ASSERT_FALSE(GetCookies(browser()->profile(), url).empty());

@@ -180,9 +178,7 @@ IN_PROC_BROWSER_TEST_F(ContentSettingsTest, BlockCookiesUsingExceptions) {

GURL url = embedded_test_server()->GetURL("/setcookie.html");

content_settings::CookieSettings* settings =

CookieSettingsFactory::GetForProfile(browser()->profile()).get();

- settings->SetCookieSetting(ContentSettingsPattern::FromURL(url),

- ContentSettingsPattern::Wildcard(),

- CONTENT_SETTING_BLOCK);

+ settings->SetCookieSetting(url, CONTENT_SETTING_BLOCK);

ui_test_utils::NavigateToURL(browser(), url);

ASSERT_TRUE(GetCookies(browser()->profile(), url).empty());

@@ -212,9 +208,7 @@ IN_PROC_BROWSER_TEST_F(ContentSettingsTest,

ui_test_utils::NavigateToURL(browser(), url);

ASSERT_TRUE(GetCookies(browser()->profile(), url).empty());

- settings->SetCookieSetting(

- ContentSettingsPattern::FromURL(url),

- ContentSettingsPattern::Wildcard(), CONTENT_SETTING_SESSION_ONLY);

+ settings->SetCookieSetting(url, CONTENT_SETTING_SESSION_ONLY);

ui_test_utils::NavigateToURL(browser(), url);

ASSERT_FALSE(GetCookies(browser()->profile(), url).empty());

}