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

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

Issue 1604021: Yet another flaky ssl test. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 10 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 | Annotate | Revision Log
« 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) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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/time.h" 5 #include "base/time.h"
6 #include "chrome/browser/browser.h" 6 #include "chrome/browser/browser.h"
7 #include "chrome/browser/pref_service.h" 7 #include "chrome/browser/pref_service.h"
8 #include "chrome/browser/profile.h" 8 #include "chrome/browser/profile.h"
9 #include "chrome/browser/tab_contents/interstitial_page.h" 9 #include "chrome/browser/tab_contents/interstitial_page.h"
10 #include "chrome/browser/tab_contents/navigation_entry.h" 10 #include "chrome/browser/tab_contents/navigation_entry.h"
(...skipping 614 matching lines...) Expand 10 before | Expand all | Expand 10 after
625 GURL(), 625 GURL(),
626 PageTransition::TYPED, 626 PageTransition::TYPED,
627 true, 0, false, NULL); 627 true, 0, false, NULL);
628 ui_test_utils::WaitForNavigation(&(tab2->controller())); 628 ui_test_utils::WaitForNavigation(&(tab2->controller()));
629 629
630 // Close the first tab. 630 // Close the first tab.
631 browser()->CloseTabContents(tab1); 631 browser()->CloseTabContents(tab1);
632 } 632 }
633 633
634 // Visit a page over bad https that is a redirect to a page with good https. 634 // Visit a page over bad https that is a redirect to a page with good https.
635 IN_PROC_BROWSER_TEST_F(SSLUITest, TestRedirectBadToGoodHTTPS) { 635 // Marked as flaky, see bug 40932.
636 IN_PROC_BROWSER_TEST_F(SSLUITest, FLAKY_TestRedirectBadToGoodHTTPS) {
636 scoped_refptr<HTTPSTestServer> good_https_server = GoodCertServer(); 637 scoped_refptr<HTTPSTestServer> good_https_server = GoodCertServer();
637 ASSERT_TRUE(good_https_server.get() != NULL); 638 ASSERT_TRUE(good_https_server.get() != NULL);
638 scoped_refptr<HTTPSTestServer> bad_https_server = BadCertServer(); 639 scoped_refptr<HTTPSTestServer> bad_https_server = BadCertServer();
639 ASSERT_TRUE(bad_https_server.get() != NULL); 640 ASSERT_TRUE(bad_https_server.get() != NULL);
640 641
641 GURL url1 = bad_https_server->TestServerPageW(L"server-redirect?"); 642 GURL url1 = bad_https_server->TestServerPageW(L"server-redirect?");
642 GURL url2 = good_https_server->TestServerPageW(L"files/ssl/google.html"); 643 GURL url2 = good_https_server->TestServerPageW(L"files/ssl/google.html");
643 644
644 ui_test_utils::NavigateToURL(browser(), GURL(url1.spec() + url2.spec())); 645 ui_test_utils::NavigateToURL(browser(), GURL(url1.spec() + url2.spec()));
645 646
(...skipping 315 matching lines...) Expand 10 before | Expand all | Expand 10 after
961 962
962 // Visit a page over https that contains a frame with a redirect. 963 // Visit a page over https that contains a frame with a redirect.
963 964
964 // XMLHttpRequest mixed in synchronous mode. 965 // XMLHttpRequest mixed in synchronous mode.
965 966
966 // XMLHttpRequest mixed in asynchronous mode. 967 // XMLHttpRequest mixed in asynchronous mode.
967 968
968 // XMLHttpRequest over bad ssl in synchronous mode. 969 // XMLHttpRequest over bad ssl in synchronous mode.
969 970
970 // XMLHttpRequest over OK ssl in synchronous mode. 971 // 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