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

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

Issue 10823029: Move WaitForLoadStop from ui_test_utils to browser_test_utils so that it can be reused in content_b… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 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 | Annotate | Revision Log
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/command_line.h" 5 #include "base/command_line.h"
6 #include "base/path_service.h" 6 #include "base/path_service.h"
7 #include "base/string_util.h" 7 #include "base/string_util.h"
8 #include "base/stringprintf.h" 8 #include "base/stringprintf.h"
9 #include "base/time.h" 9 #include "base/time.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
(...skipping 598 matching lines...) Expand 10 before | Expand all | Expand 10 after
609 // Open a page with a HTTPS error in a tab with no prior navigation (through a 609 // Open a page with a HTTPS error in a tab with no prior navigation (through a
610 // link with a blank target). This is to test that the lack of navigation entry 610 // link with a blank target). This is to test that the lack of navigation entry
611 // does not cause any problems (it was causing a crasher, see 611 // does not cause any problems (it was causing a crasher, see
612 // http://crbug.com/19941). 612 // http://crbug.com/19941).
613 IN_PROC_BROWSER_TEST_F(SSLUITest, MAYBE_TestHTTPSErrorWithNoNavEntry) { 613 IN_PROC_BROWSER_TEST_F(SSLUITest, MAYBE_TestHTTPSErrorWithNoNavEntry) {
614 ASSERT_TRUE(https_server_expired_.Start()); 614 ASSERT_TRUE(https_server_expired_.Start());
615 615
616 GURL url = https_server_expired_.GetURL("files/ssl/google.htm"); 616 GURL url = https_server_expired_.GetURL("files/ssl/google.htm");
617 TabContents* tab2 = chrome::AddSelectedTabWithURL( 617 TabContents* tab2 = chrome::AddSelectedTabWithURL(
618 browser(), url, content::PAGE_TRANSITION_TYPED); 618 browser(), url, content::PAGE_TRANSITION_TYPED);
619 ui_test_utils::WaitForLoadStop(tab2->web_contents()); 619 content::WaitForLoadStop(tab2->web_contents());
620 620
621 // Verify our assumption that there was no prior navigation. 621 // Verify our assumption that there was no prior navigation.
622 EXPECT_FALSE(chrome::CanGoBack(browser())); 622 EXPECT_FALSE(chrome::CanGoBack(browser()));
623 623
624 // We should have an interstitial page showing. 624 // We should have an interstitial page showing.
625 ASSERT_TRUE(tab2->web_contents()->GetInterstitialPage()); 625 ASSERT_TRUE(tab2->web_contents()->GetInterstitialPage());
626 } 626 }
627 627
628 // Disabled due to crash in downloads code that this triggers. 628 // Disabled due to crash in downloads code that this triggers.
629 // http://crbug.com/95331 629 // http://crbug.com/95331
(...skipping 824 matching lines...) Expand 10 before | Expand all | Expand 10 after
1454 1454
1455 // Visit a page over https that contains a frame with a redirect. 1455 // Visit a page over https that contains a frame with a redirect.
1456 1456
1457 // XMLHttpRequest insecure content in synchronous mode. 1457 // XMLHttpRequest insecure content in synchronous mode.
1458 1458
1459 // XMLHttpRequest insecure content in asynchronous mode. 1459 // XMLHttpRequest insecure content in asynchronous mode.
1460 1460
1461 // XMLHttpRequest over bad ssl in synchronous mode. 1461 // XMLHttpRequest over bad ssl in synchronous mode.
1462 1462
1463 // XMLHttpRequest over OK ssl in synchronous mode. 1463 // XMLHttpRequest over OK ssl in synchronous mode.
OLDNEW
« no previous file with comments | « chrome/browser/referrer_policy_browsertest.cc ('k') | chrome/browser/tab_contents/render_view_context_menu_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698