chrome/browser/extensions/api/content_settings/content_settings_apitest.cc - Issue 2655443003: Unify the "get" and "set" cookie access settings.

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 2655443003: Unify the "get" and "set" cookie access settings. (Closed)

Patch Set: rebase Created 3 years, 11 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/net/chrome_network_delegate.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 0ec344537a93ed332d01b112a259e63cad8c8ce2..d0fe41e723f682d67e4add41efdd7cfb69cceacf 100644

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

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

@@ -71,10 +71,8 @@ class ExtensionContentSettingsApiTest : public ExtensionApiTest {

// Check default content settings by using an unknown URL.

GURL example_url("http://www.example.com");

- EXPECT_TRUE(cookie_settings->IsReadingCookieAllowed(

- example_url, example_url));

- EXPECT_TRUE(cookie_settings->IsSettingCookieAllowed(

- example_url, example_url));

+ EXPECT_TRUE(

+ cookie_settings->IsCookieAccessAllowed(example_url, example_url));

EXPECT_TRUE(cookie_settings->IsCookieSessionOnly(example_url));

EXPECT_EQ(CONTENT_SETTING_ALLOW,

map->GetContentSetting(example_url,

@@ -134,7 +132,7 @@ class ExtensionContentSettingsApiTest : public ExtensionApiTest {

// Check content settings for www.google.com

GURL url("http://www.google.com");

- EXPECT_FALSE(cookie_settings->IsReadingCookieAllowed(url, url));

+ EXPECT_FALSE(cookie_settings->IsCookieAccessAllowed(url, url));

EXPECT_EQ(CONTENT_SETTING_ALLOW,

map->GetContentSetting(

url, url, CONTENT_SETTINGS_TYPE_IMAGES, std::string()));

@@ -180,8 +178,7 @@ class ExtensionContentSettingsApiTest : public ExtensionApiTest {

// Check content settings for www.google.com

GURL url("http://www.google.com");

- EXPECT_TRUE(cookie_settings->IsReadingCookieAllowed(url, url));

- EXPECT_TRUE(cookie_settings->IsSettingCookieAllowed(url, url));

+ EXPECT_TRUE(cookie_settings->IsCookieAccessAllowed(url, url));

EXPECT_FALSE(cookie_settings->IsCookieSessionOnly(url));

EXPECT_EQ(CONTENT_SETTING_ALLOW,

map->GetContentSetting(