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

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

Issue 2807723002: Use SameDocument term instead of SamePage in chrome tests. (Closed)
Patch Set: Self review Created 3 years, 8 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
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 3869 matching lines...) Expand 10 before | Expand all | Expand 10 after
3880 IN_PROC_BROWSER_TEST_F(SSLUITest, SamePageHasSSLState) { 3880 IN_PROC_BROWSER_TEST_F(SSLUITest, SamePageHasSSLState) {
3881 ASSERT_TRUE(embedded_test_server()->Start()); 3881 ASSERT_TRUE(embedded_test_server()->Start());
3882 ASSERT_TRUE(https_server_.Start()); 3882 ASSERT_TRUE(https_server_.Start());
3883 3883
3884 WebContents* tab = browser()->tab_strip_model()->GetActiveWebContents(); 3884 WebContents* tab = browser()->tab_strip_model()->GetActiveWebContents();
3885 3885
3886 // Navigate to a simple page and then perform an in-page navigation. 3886 // Navigate to a simple page and then perform an in-page navigation.
3887 GURL start_url(embedded_test_server()->GetURL("/title1.html")); 3887 GURL start_url(embedded_test_server()->GetURL("/title1.html"));
3888 ui_test_utils::NavigateToURL(browser(), start_url); 3888 ui_test_utils::NavigateToURL(browser(), start_url);
3889 3889
3890 GURL same_page_url(embedded_test_server()->GetURL("/title1.html#foo")); 3890 GURL fragment_change_url(embedded_test_server()->GetURL("/title1.html#foo"));
3891 ui_test_utils::NavigateToURL(browser(), same_page_url); 3891 ui_test_utils::NavigateToURL(browser(), fragment_change_url);
3892 CheckUnauthenticatedState(tab, AuthState::NONE); 3892 CheckUnauthenticatedState(tab, AuthState::NONE);
3893 3893
3894 // Replace the URL of the current NavigationEntry with one that will cause 3894 // Replace the URL of the current NavigationEntry with one that will cause
3895 // a server redirect when loaded. 3895 // a server redirect when loaded.
3896 { 3896 {
3897 GURL redirect_dest_url(https_server_.GetURL("/ssl/google.html")); 3897 GURL redirect_dest_url(https_server_.GetURL("/ssl/google.html"));
3898 content::TestNavigationObserver observer(tab); 3898 content::TestNavigationObserver observer(tab);
3899 std::string script = "history.replaceState({}, '', '/server-redirect?" + 3899 std::string script = "history.replaceState({}, '', '/server-redirect?" +
3900 redirect_dest_url.spec() + "')"; 3900 redirect_dest_url.spec() + "')";
3901 EXPECT_TRUE(ExecuteScript(tab, script)); 3901 EXPECT_TRUE(ExecuteScript(tab, script));
(...skipping 547 matching lines...) Expand 10 before | Expand all | Expand 10 after
4449 4449
4450 // Visit a page over https that contains a frame with a redirect. 4450 // Visit a page over https that contains a frame with a redirect.
4451 4451
4452 // XMLHttpRequest insecure content in synchronous mode. 4452 // XMLHttpRequest insecure content in synchronous mode.
4453 4453
4454 // XMLHttpRequest insecure content in asynchronous mode. 4454 // XMLHttpRequest insecure content in asynchronous mode.
4455 4455
4456 // XMLHttpRequest over bad ssl in synchronous mode. 4456 // XMLHttpRequest over bad ssl in synchronous mode.
4457 4457
4458 // XMLHttpRequest over OK ssl in synchronous mode. 4458 // XMLHttpRequest over OK ssl in synchronous mode.
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698