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 7604030: Mark SSLUITest.TestHTTPSErrorWithNoNavEntry flaky on ChromeOS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 4 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/time.h" 6 #include "base/time.h"
7 #include "chrome/app/chrome_command_ids.h" 7 #include "chrome/app/chrome_command_ids.h"
8 #include "chrome/browser/tabs/tab_strip_model.h" 8 #include "chrome/browser/tabs/tab_strip_model.h"
9 #include "chrome/browser/ui/browser.h" 9 #include "chrome/browser/ui/browser.h"
10 #include "chrome/browser/ui/browser_navigator.h" 10 #include "chrome/browser/ui/browser_navigator.h"
(...skipping 417 matching lines...) Expand 10 before | Expand all | Expand 10 after
428 ui_test_utils::WaitForNavigation(&(tab->controller())); 428 ui_test_utils::WaitForNavigation(&(tab->controller()));
429 429
430 // We should be showing the second good page. 430 // We should be showing the second good page.
431 EXPECT_FALSE(browser()->GetSelectedTabContents()->interstitial_page()); 431 EXPECT_FALSE(browser()->GetSelectedTabContents()->interstitial_page());
432 CheckUnauthenticatedState(tab); 432 CheckUnauthenticatedState(tab);
433 EXPECT_FALSE(tab->controller().CanGoForward()); 433 EXPECT_FALSE(tab->controller().CanGoForward());
434 NavigationEntry* entry4 = tab->controller().GetActiveEntry(); 434 NavigationEntry* entry4 = tab->controller().GetActiveEntry();
435 EXPECT_TRUE(entry2 == entry4); 435 EXPECT_TRUE(entry2 == entry4);
436 } 436 }
437 437
438 // Flaky on CrOS http://crbug.com/92292
439 #if defined(OS_CHROMEOS)
440 #define MAYBE_TestHTTPSErrorWithNoNavEntry \
441 DISABLED_TestHTTPSErrorWithNoNavEntry
442 #else
443 #define MAYBE_TestHTTPSErrorWithNoNavEntry TestHTTPSErrorWithNoNavEntry
444 #endif // defined(OS_CHROMEOS)
445
438 // Open a page with a HTTPS error in a tab with no prior navigation (through a 446 // Open a page with a HTTPS error in a tab with no prior navigation (through a
439 // link with a blank target). This is to test that the lack of navigation entry 447 // link with a blank target). This is to test that the lack of navigation entry
440 // does not cause any problems (it was causing a crasher, see 448 // does not cause any problems (it was causing a crasher, see
441 // http://crbug.com/19941). 449 // http://crbug.com/19941).
442 IN_PROC_BROWSER_TEST_F(SSLUITest, TestHTTPSErrorWithNoNavEntry) { 450 IN_PROC_BROWSER_TEST_F(SSLUITest, MAYBE_TestHTTPSErrorWithNoNavEntry) {
443 ASSERT_TRUE(https_server_expired_.Start()); 451 ASSERT_TRUE(https_server_expired_.Start());
444 452
445 GURL url = https_server_expired_.GetURL("files/ssl/google.htm"); 453 GURL url = https_server_expired_.GetURL("files/ssl/google.htm");
446 TabContentsWrapper* tab2 = 454 TabContentsWrapper* tab2 =
447 browser()->AddSelectedTabWithURL(url, PageTransition::TYPED); 455 browser()->AddSelectedTabWithURL(url, PageTransition::TYPED);
448 ui_test_utils::WaitForLoadStop(tab2->tab_contents()); 456 ui_test_utils::WaitForLoadStop(tab2->tab_contents());
449 457
450 // Verify our assumption that there was no prior navigation. 458 // Verify our assumption that there was no prior navigation.
451 EXPECT_FALSE(browser()->command_updater()->IsCommandEnabled(IDC_BACK)); 459 EXPECT_FALSE(browser()->command_updater()->IsCommandEnabled(IDC_BACK));
452 460
(...skipping 722 matching lines...) Expand 10 before | Expand all | Expand 10 after
1175 1183
1176 // Visit a page over https that contains a frame with a redirect. 1184 // Visit a page over https that contains a frame with a redirect.
1177 1185
1178 // XMLHttpRequest insecure content in synchronous mode. 1186 // XMLHttpRequest insecure content in synchronous mode.
1179 1187
1180 // XMLHttpRequest insecure content in asynchronous mode. 1188 // XMLHttpRequest insecure content in asynchronous mode.
1181 1189
1182 // XMLHttpRequest over bad ssl in synchronous mode. 1190 // XMLHttpRequest over bad ssl in synchronous mode.
1183 1191
1184 // XMLHttpRequest over OK ssl in synchronous mode. 1192 // 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