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

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

Issue 1444413002: Revert of Simplify starting a navigation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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 | third_party/WebKit/LayoutTests/http/tests/loading/307-after-303-after-post-expected.txt » ('j') | 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 "base/base_switches.h" 5 #include "base/base_switches.h"
6 #include "base/bind.h" 6 #include "base/bind.h"
7 #include "base/bind_helpers.h" 7 #include "base/bind_helpers.h"
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/location.h" 10 #include "base/location.h"
(...skipping 2558 matching lines...) Expand 10 before | Expand all | Expand 10 after
2569 https_server_url.ReplaceComponents(replacements); 2569 https_server_url.ReplaceComponents(replacements);
2570 2570
2571 WebContents* contents = browser()->tab_strip_model()->GetActiveWebContents(); 2571 WebContents* contents = browser()->tab_strip_model()->GetActiveWebContents();
2572 content::TestNavigationObserver observer(contents, 2); 2572 content::TestNavigationObserver observer(contents, 2);
2573 ui_test_utils::NavigateToURL(browser(), https_server_mismatched_url); 2573 ui_test_utils::NavigateToURL(browser(), https_server_mismatched_url);
2574 observer.Wait(); 2574 observer.Wait();
2575 2575
2576 CheckSecurityState(contents, CertError::NONE, 2576 CheckSecurityState(contents, CertError::NONE,
2577 content::SECURITY_STYLE_AUTHENTICATED, AuthState::NONE); 2577 content::SECURITY_STYLE_AUTHENTICATED, AuthState::NONE);
2578 replacements.SetHostStr("mail.example.com"); 2578 replacements.SetHostStr("mail.example.com");
2579 // blink strips the ref from requests.
2580 replacements.ClearRef();
2581 GURL https_server_new_url = https_server_url.ReplaceComponents(replacements); 2579 GURL https_server_new_url = https_server_url.ReplaceComponents(replacements);
2582 // Verify that the current URL is the suggested URL. 2580 // Verify that the current URL is the suggested URL.
2583 EXPECT_EQ(https_server_new_url.spec(), 2581 EXPECT_EQ(https_server_new_url.spec(),
2584 contents->GetLastCommittedURL().spec()); 2582 contents->GetLastCommittedURL().spec());
2585 } 2583 }
2586 2584
2587 // Visit the URL example.org on a server that presents a valid certificate 2585 // Visit the URL example.org on a server that presents a valid certificate
2588 // for www.example.org. Verify that the page redirects to www.example.org. 2586 // for www.example.org. Verify that the page redirects to www.example.org.
2589 IN_PROC_BROWSER_TEST_F(CommonNameMismatchBrowserTest, 2587 IN_PROC_BROWSER_TEST_F(CommonNameMismatchBrowserTest,
2590 CheckWWWSubdomainMismatchInverse) { 2588 CheckWWWSubdomainMismatchInverse) {
(...skipping 290 matching lines...) Expand 10 before | Expand all | Expand 10 after
2881 2879
2882 // Visit a page over https that contains a frame with a redirect. 2880 // Visit a page over https that contains a frame with a redirect.
2883 2881
2884 // XMLHttpRequest insecure content in synchronous mode. 2882 // XMLHttpRequest insecure content in synchronous mode.
2885 2883
2886 // XMLHttpRequest insecure content in asynchronous mode. 2884 // XMLHttpRequest insecure content in asynchronous mode.
2887 2885
2888 // XMLHttpRequest over bad ssl in synchronous mode. 2886 // XMLHttpRequest over bad ssl in synchronous mode.
2889 2887
2890 // XMLHttpRequest over OK ssl in synchronous mode. 2888 // XMLHttpRequest over OK ssl in synchronous mode.
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/LayoutTests/http/tests/loading/307-after-303-after-post-expected.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698