Chromium Code Reviews| Index: chrome/browser/ssl/ssl_browser_tests.cc |
| diff --git a/chrome/browser/ssl/ssl_browser_tests.cc b/chrome/browser/ssl/ssl_browser_tests.cc |
| index 6be999e6fe7a0071a48f4c4fae7836b6748df930..190c8be59c21727637fc58d44d381cde8b77aa0e 100644 |
| --- a/chrome/browser/ssl/ssl_browser_tests.cc |
| +++ b/chrome/browser/ssl/ssl_browser_tests.cc |
| @@ -296,6 +296,16 @@ class SSLUITestBlock : public SSLUITest { |
| } |
| }; |
| +class SSLUITestIgnoreCertErrors : public SSLUITest { |
| + public: |
| + SSLUITestIgnoreCertErrors() : SSLUITest() {} |
| + |
| + virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { |
| + // Browser will ignore certificate errors. |
| + command_line->AppendSwitch(switches::kIgnoreCertificateErrors); |
| + } |
| +}; |
| + |
| // Visits a regular page over http. |
| IN_PROC_BROWSER_TEST_F(SSLUITest, TestHTTP) { |
| ASSERT_TRUE(test_server()->Start()); |
| @@ -1449,6 +1459,35 @@ IN_PROC_BROWSER_TEST_F(SSLUITestBlock, TestBlockRunningInsecureContent) { |
| CheckAuthenticatedState(chrome::GetActiveWebContents(browser()), false); |
| } |
| +IN_PROC_BROWSER_TEST_F(SSLUITestIgnoreCertErrors, TestWSS) { |
|
sky
2012/08/10 15:54:47
Add a description as to what this is testing.
bashi
2012/08/12 23:13:02
Done.
|
| + ASSERT_TRUE(test_server()->Start()); |
| + ASSERT_TRUE(https_server_expired_.Start()); |
| + |
| + // Start pywebsocket with TLS. |
| + content::TestWebSocketServer wss_server; |
| + int port = wss_server.UseRandomPort(); |
| + wss_server.UseTLS(); |
| + FilePath wss_root_dir; |
| + ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &wss_root_dir)); |
| + ASSERT_TRUE(wss_server.Start(wss_root_dir)); |
| + |
| + // Setup page title observer. |
| + WebContents* tab = chrome::GetActiveWebContents(browser()); |
| + content::TitleWatcher watcher(tab, ASCIIToUTF16("PASS")); |
| + watcher.AlsoWaitForTitle(ASCIIToUTF16("FAIL")); |
| + |
| + // Visit bad HTTPS page. |
| + std::string urlPath = |
|
Yuta Kitamura
2012/08/10 06:56:24
url_path
bashi
2012/08/12 23:13:02
Done.
|
| + StringPrintf("%s%d%s", "https://localhost:", port, "/wss.html"); |
| + ui_test_utils::NavigateToURL(browser(), GURL(urlPath)); |
| + |
| + // We shouldn't have an interstitial page showing here. |
| + |
| + // Test page run a WebSocket wss connection test. The result will be shown |
| + // as page title. |
| + const string16 result = watcher.WaitAndGetTitle(); |
| + EXPECT_TRUE(LowerCaseEqualsASCII(result, "pass")); |
| +} |
| // TODO(jcampan): more tests to do below. |