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 "base/test/scoped_feature_list.h" | 9 #include "base/test/scoped_feature_list.h" |
10 #include "build/build_config.h" | 10 #include "build/build_config.h" |
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
89 | 89 |
90 class ContentSettingsTest : public InProcessBrowserTest { | 90 class ContentSettingsTest : public InProcessBrowserTest { |
91 public: | 91 public: |
92 ContentSettingsTest() : https_server_(net::EmbeddedTestServer::TYPE_HTTPS) { | 92 ContentSettingsTest() : https_server_(net::EmbeddedTestServer::TYPE_HTTPS) { |
93 https_server_.ServeFilesFromSourceDirectory("chrome/test/data"); | 93 https_server_.ServeFilesFromSourceDirectory("chrome/test/data"); |
94 } | 94 } |
95 | 95 |
96 void SetUpOnMainThread() override { | 96 void SetUpOnMainThread() override { |
97 BrowserThread::PostTask( | 97 BrowserThread::PostTask( |
98 BrowserThread::IO, FROM_HERE, | 98 BrowserThread::IO, FROM_HERE, |
99 base::Bind(&chrome_browser_net::SetUrlRequestMocksEnabled, true)); | 99 base::BindOnce(&chrome_browser_net::SetUrlRequestMocksEnabled, true)); |
100 } | 100 } |
101 | 101 |
102 // Check the cookie for the given URL in an incognito window. | 102 // Check the cookie for the given URL in an incognito window. |
103 void CookieCheckIncognitoWindow(const GURL& url, bool cookies_enabled) { | 103 void CookieCheckIncognitoWindow(const GURL& url, bool cookies_enabled) { |
104 ASSERT_TRUE(content::GetCookies(browser()->profile(), url).empty()); | 104 ASSERT_TRUE(content::GetCookies(browser()->profile(), url).empty()); |
105 | 105 |
106 Browser* incognito = CreateIncognitoBrowser(); | 106 Browser* incognito = CreateIncognitoBrowser(); |
107 ASSERT_TRUE(content::GetCookies(incognito->profile(), url).empty()); | 107 ASSERT_TRUE(content::GetCookies(incognito->profile(), url).empty()); |
108 ui_test_utils::NavigateToURL(incognito, url); | 108 ui_test_utils::NavigateToURL(incognito, url); |
109 ASSERT_EQ(cookies_enabled, | 109 ASSERT_EQ(cookies_enabled, |
(...skipping 430 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
540 #endif // BUILDFLAG(ENABLE_PEPPER_CDMS) && defined(WIDEVINE_CDM_AVAILABLE) | 540 #endif // BUILDFLAG(ENABLE_PEPPER_CDMS) && defined(WIDEVINE_CDM_AVAILABLE) |
541 | 541 |
542 #if !defined(DISABLE_NACL) | 542 #if !defined(DISABLE_NACL) |
543 IN_PROC_BROWSER_TEST_F(PepperContentSettingsSpecialCasesJavaScriptBlockedTest, | 543 IN_PROC_BROWSER_TEST_F(PepperContentSettingsSpecialCasesJavaScriptBlockedTest, |
544 NaCl) { | 544 NaCl) { |
545 RunJavaScriptBlockedTest("load_nacl_no_js.html", true); | 545 RunJavaScriptBlockedTest("load_nacl_no_js.html", true); |
546 } | 546 } |
547 #endif // !defined(DISABLE_NACL) | 547 #endif // !defined(DISABLE_NACL) |
548 | 548 |
549 #endif // BUILDFLAG(ENABLE_PLUGINS) | 549 #endif // BUILDFLAG(ENABLE_PLUGINS) |
OLD | NEW |