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

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

Issue 2045653002: Re-enable SSLUITest.TestUnauthenticatedFrameNavigation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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 2168 matching lines...) Expand 10 before | Expand all | Expand 10 after
2179 ASSERT_TRUE(success); 2179 ASSERT_TRUE(success);
2180 observer.Wait(); 2180 observer.Wait();
2181 2181
2182 // We should still be authentication broken. 2182 // We should still be authentication broken.
2183 CheckAuthenticationBrokenState( 2183 CheckAuthenticationBrokenState(
2184 tab, net::CERT_STATUS_DATE_INVALID, AuthState::NONE); 2184 tab, net::CERT_STATUS_DATE_INVALID, AuthState::NONE);
2185 } 2185 }
2186 2186
2187 // From an HTTP top frame, navigate to good and bad HTTPS (security state should 2187 // From an HTTP top frame, navigate to good and bad HTTPS (security state should
2188 // stay unauthenticated). 2188 // stay unauthenticated).
2189 // Disabled, flakily exceeds test timeout, http://crbug.com/43437. 2189 IN_PROC_BROWSER_TEST_F(SSLUITest, TestUnauthenticatedFrameNavigation) {
2190 IN_PROC_BROWSER_TEST_F(SSLUITest, DISABLED_TestUnauthenticatedFrameNavigation) {
2191 ASSERT_TRUE(embedded_test_server()->Start()); 2190 ASSERT_TRUE(embedded_test_server()->Start());
2192 ASSERT_TRUE(https_server_.Start()); 2191 ASSERT_TRUE(https_server_.Start());
2193 ASSERT_TRUE(https_server_expired_.Start()); 2192 ASSERT_TRUE(https_server_expired_.Start());
2194 2193
2195 std::string top_frame_path; 2194 std::string top_frame_path;
2196 GetTopFramePath(*embedded_test_server(), https_server_, https_server_expired_, 2195 GetTopFramePath(*embedded_test_server(), https_server_, https_server_expired_,
2197 &top_frame_path); 2196 &top_frame_path);
2198 2197
2199 WebContents* tab = browser()->tab_strip_model()->GetActiveWebContents(); 2198 WebContents* tab = browser()->tab_strip_model()->GetActiveWebContents();
2200 ui_test_utils::NavigateToURL(browser(), 2199 ui_test_utils::NavigateToURL(browser(),
(...skipping 828 matching lines...) Expand 10 before | Expand all | Expand 10 after
3029 3028
3030 // Visit a page over https that contains a frame with a redirect. 3029 // Visit a page over https that contains a frame with a redirect.
3031 3030
3032 // XMLHttpRequest insecure content in synchronous mode. 3031 // XMLHttpRequest insecure content in synchronous mode.
3033 3032
3034 // XMLHttpRequest insecure content in asynchronous mode. 3033 // XMLHttpRequest insecure content in asynchronous mode.
3035 3034
3036 // XMLHttpRequest over bad ssl in synchronous mode. 3035 // XMLHttpRequest over bad ssl in synchronous mode.
3037 3036
3038 // XMLHttpRequest over OK ssl in synchronous mode. 3037 // 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