Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2650)

Unified Diff: chrome/browser/content_settings/content_settings_browsertest.cc

Issue 11275088: Remove implicit scoped_refptr operator T* Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 8 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:
View side-by-side diff with in-line comments
Download patch
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 0c1c2b6dc46af2bd506ee2ad41184e8de6d723e9..9363282e12bfcdd77d4b59a1e71f4e65bb039fbb 100644
--- a/chrome/browser/content_settings/content_settings_browsertest.cc
+++ b/chrome/browser/content_settings/content_settings_browsertest.cc
@@ -154,7 +154,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);
@@ -173,7 +173,7 @@ 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());
+ CookieSettings::Factory::GetForProfile(browser()->profile()).get();
settings->SetCookieSetting(
ContentSettingsPattern::FromURL(url),
ContentSettingsPattern::Wildcard(), CONTENT_SETTING_BLOCK);
@@ -201,7 +201,7 @@ IN_PROC_BROWSER_TEST_F(ContentSettingsTest,
GURL url = URLRequestMockHTTPJob::GetMockUrl(
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);

Powered by Google App Engine
This is Rietveld 408576698