chrome/browser/content_settings/content_settings_browsertest.cc - Issue 8383004: Adding CookieSettings for storing cookie content 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/content_settings/content_settings_browsertest.cc

Issue 8383004: Adding CookieSettings for storing cookie content settings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fixing the rebase. Created 9 years, 2 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:

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 d9927175e3de45b5e0d3ac90a1d2e151f4788412..cbe2b94f34136d74fd5ebd8b2c0d0459ec5dee86 100644

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

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

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

#include "base/stringprintf.h"

#include "base/utf_string_conversions.h"

+#include "chrome/browser/content_settings/cookie_settings.h"

#include "chrome/browser/content_settings/host_content_settings_map.h"

#include "chrome/browser/content_settings/tab_specific_content_settings.h"

#include "chrome/browser/profiles/profile.h"

@@ -19,8 +20,8 @@ IN_PROC_BROWSER_TEST_F(InProcessBrowserTest, RedirectLoopCookies) {

GURL test_url = test_server()->GetURL("files/redirect-loop.html");

- browser()->profile()->GetHostContentSettingsMap()->SetDefaultContentSetting(

- CONTENT_SETTINGS_TYPE_COOKIES, CONTENT_SETTING_BLOCK);

+ CookieSettings::GetForProfile(browser()->profile())->

+ SetDefaultCookieSetting(CONTENT_SETTING_BLOCK);

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

@@ -60,8 +61,8 @@ IN_PROC_BROWSER_TEST_F(InProcessBrowserTest, RedirectCrossOrigin) {

host_port.port()));

GURL test_url = test_server()->GetURL("server-redirect?" + redirect);

- browser()->profile()->GetHostContentSettingsMap()->SetDefaultContentSetting(

- CONTENT_SETTINGS_TYPE_COOKIES, CONTENT_SETTING_BLOCK);

+ CookieSettings::GetForProfile(browser()->profile())->

+ SetDefaultCookieSetting(CONTENT_SETTING_BLOCK);

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