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

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

Issue 9439001: Disable flaking SSLUI tests (Closed)
Patch Set: Merged Created 8 years, 10 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
« 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) 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/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 344 matching lines...) Expand 10 before | Expand all | Expand 10 after
355 // We should be back to the original good page. 355 // We should be back to the original good page.
356 CheckAuthenticatedState(tab, false); 356 CheckAuthenticatedState(tab, false);
357 357
358 // Try to navigate to a new page. (to make sure bug 5800 is fixed). 358 // Try to navigate to a new page. (to make sure bug 5800 is fixed).
359 ui_test_utils::NavigateToURL(browser(), 359 ui_test_utils::NavigateToURL(browser(),
360 test_server()->GetURL("files/ssl/google.html")); 360 test_server()->GetURL("files/ssl/google.html"));
361 CheckUnauthenticatedState(tab); 361 CheckUnauthenticatedState(tab);
362 } 362 }
363 363
364 // Visits a page with https error and then goes back using Browser::GoBack. 364 // Visits a page with https error and then goes back using Browser::GoBack.
365 // See http://crbug.com/40932
wtc 2012/02/23 22:15:00 Please add "Disabled" to this comment. Otherwise
tpayne 2012/02/23 22:16:12 This CL was already landed by vandebo. Another CL
365 IN_PROC_BROWSER_TEST_F(SSLUITest, 366 IN_PROC_BROWSER_TEST_F(SSLUITest,
366 TestHTTPSExpiredCertAndGoBackViaButton) { 367 DISABLED_TestHTTPSExpiredCertAndGoBackViaButton) {
367 ASSERT_TRUE(test_server()->Start()); 368 ASSERT_TRUE(test_server()->Start());
368 ASSERT_TRUE(https_server_expired_.Start()); 369 ASSERT_TRUE(https_server_expired_.Start());
369 370
370 // First navigate to an HTTP page. 371 // First navigate to an HTTP page.
371 ui_test_utils::NavigateToURL(browser(), 372 ui_test_utils::NavigateToURL(browser(),
372 test_server()->GetURL("files/ssl/google.html")); 373 test_server()->GetURL("files/ssl/google.html"));
373 WebContents* tab = browser()->GetSelectedWebContents(); 374 WebContents* tab = browser()->GetSelectedWebContents();
374 NavigationEntry* entry = tab->GetController().GetActiveEntry(); 375 NavigationEntry* entry = tab->GetController().GetActiveEntry();
375 ASSERT_TRUE(entry); 376 ASSERT_TRUE(entry);
376 377
(...skipping 951 matching lines...) Expand 10 before | Expand all | Expand 10 after
1328 1329
1329 // Visit a page over https that contains a frame with a redirect. 1330 // Visit a page over https that contains a frame with a redirect.
1330 1331
1331 // XMLHttpRequest insecure content in synchronous mode. 1332 // XMLHttpRequest insecure content in synchronous mode.
1332 1333
1333 // XMLHttpRequest insecure content in asynchronous mode. 1334 // XMLHttpRequest insecure content in asynchronous mode.
1334 1335
1335 // XMLHttpRequest over bad ssl in synchronous mode. 1336 // XMLHttpRequest over bad ssl in synchronous mode.
1336 1337
1337 // XMLHttpRequest over OK ssl in synchronous mode. 1338 // 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