chrome/browser/content_settings/content_settings_browsertest.cc - Issue 15984016: Call scoped_refptr<T>::get() rather than relying on implicit "operator T*"

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 15984016: Call scoped_refptr<T>::get() rather than relying on implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebased Created 7 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 | « chrome/browser/component_updater/component_updater_service.cc ('k') | chrome/browser/content_settings/content_settings_internal_extension_provider.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 38fbc006f1989a94e5cd7e56c627a2fbf7fa975a..3bb6c42f37d7c89e77bc4e913a8242eae787dcc2 100644

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

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

@@ -157,7 +157,7 @@ IN_PROC_BROWSER_TEST_F(ContentSettingsTest, AllowCookiesUsingExceptions) {

ASSERT_TRUE(test_server()->Start());

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

CookieSettings* settings =

- CookieSettings::Factory::GetForProfile(browser()->profile());

+ CookieSettings::Factory::GetForProfile(browser()->profile()).get();

settings->SetDefaultCookieSetting(CONTENT_SETTING_BLOCK);

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

@@ -176,10 +176,10 @@ IN_PROC_BROWSER_TEST_F(ContentSettingsTest, BlockCookiesUsingExceptions) {

ASSERT_TRUE(test_server()->Start());

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

CookieSettings* settings =

- CookieSettings::Factory::GetForProfile(browser()->profile());

- settings->SetCookieSetting(

- ContentSettingsPattern::FromURL(url),

- ContentSettingsPattern::Wildcard(), CONTENT_SETTING_BLOCK);

+ CookieSettings::Factory::GetForProfile(browser()->profile()).get();

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

+ ContentSettingsPattern::Wildcard(),

+ CONTENT_SETTING_BLOCK);

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

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

@@ -204,7 +204,7 @@ IN_PROC_BROWSER_TEST_F(ContentSettingsTest,

GURL url = URLRequestMockHTTPJob::GetMockUrl(

base::FilePath(FILE_PATH_LITERAL("setcookie.html")));

CookieSettings* settings =

- CookieSettings::Factory::GetForProfile(browser()->profile());

+ CookieSettings::Factory::GetForProfile(browser()->profile()).get();

settings->SetDefaultCookieSetting(CONTENT_SETTING_BLOCK);

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