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

Side by Side Diff: chrome/browser/ssl/ssl_browser_tests.cc

Issue 2118383004: Enable TestWSSInvalidCertAndClose on Windows (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 <utility> 5 #include <utility>
6 6
7 #include "base/base_switches.h" 7 #include "base/base_switches.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/bind_helpers.h" 9 #include "base/bind_helpers.h"
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 1027 matching lines...) Expand 10 before | Expand all | Expand 10 after
1038 GetInterstitialPage()); 1038 GetInterstitialPage());
1039 CheckUnauthenticatedState(tab, AuthState::NONE); 1039 CheckUnauthenticatedState(tab, AuthState::NONE);
1040 EXPECT_FALSE(tab->GetController().CanGoForward()); 1040 EXPECT_FALSE(tab->GetController().CanGoForward());
1041 NavigationEntry* entry4 = tab->GetController().GetActiveEntry(); 1041 NavigationEntry* entry4 = tab->GetController().GetActiveEntry();
1042 EXPECT_TRUE(entry2 == entry4); 1042 EXPECT_TRUE(entry2 == entry4);
1043 } 1043 }
1044 1044
1045 // Visit a HTTP page which request WSS connection to a server providing invalid 1045 // Visit a HTTP page which request WSS connection to a server providing invalid
1046 // certificate. Close the page while WSS connection waits for SSLManager's 1046 // certificate. Close the page while WSS connection waits for SSLManager's
1047 // response from UI thread. 1047 // response from UI thread.
1048 // Disabled on Windows because it was flaking on XP Tests (1). crbug.com/165258 1048 IN_PROC_BROWSER_TEST_F(SSLUITest, TestWSSInvalidCertAndClose) {
1049 #if defined(OS_WIN)
1050 #define MAYBE_TestWSSInvalidCertAndClose DISABLED_TestWSSInvalidCertAndClose
1051 #else
1052 #define MAYBE_TestWSSInvalidCertAndClose TestWSSInvalidCertAndClose
1053 #endif
1054 IN_PROC_BROWSER_TEST_F(SSLUITest, MAYBE_TestWSSInvalidCertAndClose) {
1055 ASSERT_TRUE(embedded_test_server()->Start()); 1049 ASSERT_TRUE(embedded_test_server()->Start());
1056 ASSERT_TRUE(wss_server_expired_.Start()); 1050 ASSERT_TRUE(wss_server_expired_.Start());
1057 1051
1058 // Setup page title observer. 1052 // Setup page title observer.
1059 WebContents* tab = browser()->tab_strip_model()->GetActiveWebContents(); 1053 WebContents* tab = browser()->tab_strip_model()->GetActiveWebContents();
1060 content::TitleWatcher watcher(tab, ASCIIToUTF16("PASS")); 1054 content::TitleWatcher watcher(tab, ASCIIToUTF16("PASS"));
1061 watcher.AlsoWaitForTitle(ASCIIToUTF16("FAIL")); 1055 watcher.AlsoWaitForTitle(ASCIIToUTF16("FAIL"));
1062 1056
1063 // Create GURLs to test pages. 1057 // Create GURLs to test pages.
1064 std::string master_url_path = base::StringPrintf( 1058 std::string master_url_path = base::StringPrintf(
(...skipping 1957 matching lines...) Expand 10 before | Expand all | Expand 10 after
3022 3016
3023 // Visit a page over https that contains a frame with a redirect. 3017 // Visit a page over https that contains a frame with a redirect.
3024 3018
3025 // XMLHttpRequest insecure content in synchronous mode. 3019 // XMLHttpRequest insecure content in synchronous mode.
3026 3020
3027 // XMLHttpRequest insecure content in asynchronous mode. 3021 // XMLHttpRequest insecure content in asynchronous mode.
3028 3022
3029 // XMLHttpRequest over bad ssl in synchronous mode. 3023 // XMLHttpRequest over bad ssl in synchronous mode.
3030 3024
3031 // XMLHttpRequest over OK ssl in synchronous mode. 3025 // XMLHttpRequest over OK ssl in synchronous mode.
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698