| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/command_line.h" | 5 #include "base/command_line.h" |
| 6 #include "base/path_service.h" | 6 #include "base/path_service.h" |
| 7 #include "base/strings/stringprintf.h" | 7 #include "base/strings/stringprintf.h" |
| 8 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
| 9 #include "build/build_config.h" | 9 #include "build/build_config.h" |
| 10 #include "chrome/browser/chrome_notification_types.h" | 10 #include "chrome/browser/chrome_notification_types.h" |
| (...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 233 | 233 |
| 234 GURL test_url = embedded_test_server()->GetURL("/redirect-loop.html"); | 234 GURL test_url = embedded_test_server()->GetURL("/redirect-loop.html"); |
| 235 | 235 |
| 236 CookieSettingsFactory::GetForProfile(browser()->profile()) | 236 CookieSettingsFactory::GetForProfile(browser()->profile()) |
| 237 ->SetDefaultCookieSetting(CONTENT_SETTING_BLOCK); | 237 ->SetDefaultCookieSetting(CONTENT_SETTING_BLOCK); |
| 238 | 238 |
| 239 ui_test_utils::NavigateToURL(browser(), test_url); | 239 ui_test_utils::NavigateToURL(browser(), test_url); |
| 240 | 240 |
| 241 content::WebContents* web_contents = | 241 content::WebContents* web_contents = |
| 242 browser()->tab_strip_model()->GetActiveWebContents(); | 242 browser()->tab_strip_model()->GetActiveWebContents(); |
| 243 ASSERT_EQ(base::UTF8ToUTF16(test_url.spec() + " failed to load"), | 243 ASSERT_EQ(base::UTF8ToUTF16(test_url.host()), web_contents->GetTitle()); |
| 244 web_contents->GetTitle()); | |
| 245 | 244 |
| 246 EXPECT_TRUE(TabSpecificContentSettings::FromWebContents(web_contents)-> | 245 EXPECT_TRUE(TabSpecificContentSettings::FromWebContents(web_contents)-> |
| 247 IsContentBlocked(CONTENT_SETTINGS_TYPE_COOKIES)); | 246 IsContentBlocked(CONTENT_SETTINGS_TYPE_COOKIES)); |
| 248 } | 247 } |
| 249 | 248 |
| 250 // TODO(jww): This should be removed after strict secure cookies is enabled for | 249 // TODO(jww): This should be removed after strict secure cookies is enabled for |
| 251 // all and this test should be moved into ContentSettingsTest above. | 250 // all and this test should be moved into ContentSettingsTest above. |
| 252 class ContentSettingsStrictSecureCookiesBrowserTest | 251 class ContentSettingsStrictSecureCookiesBrowserTest |
| 253 : public ContentSettingsTest { | 252 : public ContentSettingsTest { |
| 254 protected: | 253 protected: |
| (...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 517 #endif // defined(ENABLE_PEPPER_CDMS) | 516 #endif // defined(ENABLE_PEPPER_CDMS) |
| 518 | 517 |
| 519 #if !defined(DISABLE_NACL) | 518 #if !defined(DISABLE_NACL) |
| 520 IN_PROC_BROWSER_TEST_F(PepperContentSettingsSpecialCasesJavaScriptBlockedTest, | 519 IN_PROC_BROWSER_TEST_F(PepperContentSettingsSpecialCasesJavaScriptBlockedTest, |
| 521 NaCl) { | 520 NaCl) { |
| 522 RunJavaScriptBlockedTest("load_nacl_no_js.html", true); | 521 RunJavaScriptBlockedTest("load_nacl_no_js.html", true); |
| 523 } | 522 } |
| 524 #endif // !defined(DISABLE_NACL) | 523 #endif // !defined(DISABLE_NACL) |
| 525 | 524 |
| 526 #endif // defined(ENABLE_PLUGINS) | 525 #endif // defined(ENABLE_PLUGINS) |
| OLD | NEW |