| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/stringprintf.h" | 5 #include "base/stringprintf.h" |
| 6 #include "base/utf_string_conversions.h" | 6 #include "base/utf_string_conversions.h" |
| 7 #include "chrome/browser/content_settings/cookie_settings.h" |
| 7 #include "chrome/browser/content_settings/host_content_settings_map.h" | 8 #include "chrome/browser/content_settings/host_content_settings_map.h" |
| 8 #include "chrome/browser/content_settings/tab_specific_content_settings.h" | 9 #include "chrome/browser/content_settings/tab_specific_content_settings.h" |
| 9 #include "chrome/browser/profiles/profile.h" | 10 #include "chrome/browser/profiles/profile.h" |
| 10 #include "chrome/browser/ui/browser.h" | 11 #include "chrome/browser/ui/browser.h" |
| 11 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" | 12 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" |
| 12 #include "chrome/test/base/in_process_browser_test.h" | 13 #include "chrome/test/base/in_process_browser_test.h" |
| 13 #include "chrome/test/base/ui_test_utils.h" | 14 #include "chrome/test/base/ui_test_utils.h" |
| 14 #include "net/test/test_server.h" | 15 #include "net/test/test_server.h" |
| 15 | 16 |
| 16 // Regression test for http://crbug.com/63649. | 17 // Regression test for http://crbug.com/63649. |
| 17 IN_PROC_BROWSER_TEST_F(InProcessBrowserTest, RedirectLoopCookies) { | 18 IN_PROC_BROWSER_TEST_F(InProcessBrowserTest, RedirectLoopCookies) { |
| 18 ASSERT_TRUE(test_server()->Start()); | 19 ASSERT_TRUE(test_server()->Start()); |
| 19 | 20 |
| 20 GURL test_url = test_server()->GetURL("files/redirect-loop.html"); | 21 GURL test_url = test_server()->GetURL("files/redirect-loop.html"); |
| 21 | 22 |
| 22 browser()->profile()->GetHostContentSettingsMap()->SetDefaultContentSetting( | 23 CookieSettings::GetForProfile(browser()->profile())-> |
| 23 CONTENT_SETTINGS_TYPE_COOKIES, CONTENT_SETTING_BLOCK); | 24 SetDefaultSetting(CONTENT_SETTING_BLOCK); |
| 24 | 25 |
| 25 ui_test_utils::NavigateToURL(browser(), test_url); | 26 ui_test_utils::NavigateToURL(browser(), test_url); |
| 26 | 27 |
| 27 TabContentsWrapper* tab_contents = browser()->GetSelectedTabContentsWrapper(); | 28 TabContentsWrapper* tab_contents = browser()->GetSelectedTabContentsWrapper(); |
| 28 ASSERT_EQ(UTF8ToUTF16(test_url.spec() + " failed to load"), | 29 ASSERT_EQ(UTF8ToUTF16(test_url.spec() + " failed to load"), |
| 29 tab_contents->tab_contents()->GetTitle()); | 30 tab_contents->tab_contents()->GetTitle()); |
| 30 | 31 |
| 31 EXPECT_TRUE(tab_contents->content_settings()->IsContentBlocked( | 32 EXPECT_TRUE(tab_contents->content_settings()->IsContentBlocked( |
| 32 CONTENT_SETTINGS_TYPE_COOKIES)); | 33 CONTENT_SETTINGS_TYPE_COOKIES)); |
| 33 } | 34 } |
| (...skipping 29 matching lines...) Expand all Loading... |
| 63 browser()->profile()->GetHostContentSettingsMap()->SetDefaultContentSetting( | 64 browser()->profile()->GetHostContentSettingsMap()->SetDefaultContentSetting( |
| 64 CONTENT_SETTINGS_TYPE_COOKIES, CONTENT_SETTING_BLOCK); | 65 CONTENT_SETTINGS_TYPE_COOKIES, CONTENT_SETTING_BLOCK); |
| 65 | 66 |
| 66 ui_test_utils::NavigateToURL(browser(), test_url); | 67 ui_test_utils::NavigateToURL(browser(), test_url); |
| 67 | 68 |
| 68 TabContentsWrapper* tab_contents = browser()->GetSelectedTabContentsWrapper(); | 69 TabContentsWrapper* tab_contents = browser()->GetSelectedTabContentsWrapper(); |
| 69 | 70 |
| 70 EXPECT_TRUE(tab_contents->content_settings()->IsContentBlocked( | 71 EXPECT_TRUE(tab_contents->content_settings()->IsContentBlocked( |
| 71 CONTENT_SETTINGS_TYPE_COOKIES)); | 72 CONTENT_SETTINGS_TYPE_COOKIES)); |
| 72 } | 73 } |
| OLD | NEW |