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

Side by Side Diff: chrome/browser/captive_portal/captive_portal_browsertest.cc

Issue 10827258: Disable CaptivePortalBrowserTest.TwoBrokenTabs on all platforms, (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 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) 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 <map> 5 #include <map>
6 #include <set> 6 #include <set>
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 1584 matching lines...) Expand 10 before | Expand all | Expand 10 after
1595 chrome::CloseTab(browser()); 1595 chrome::CloseTab(browser());
1596 1596
1597 // Go through the standard slow load login, and make sure it still works. 1597 // Go through the standard slow load login, and make sure it still works.
1598 SlowLoadBehindCaptivePortal(browser(), true); 1598 SlowLoadBehindCaptivePortal(browser(), true);
1599 Login(browser(), 1, 0); 1599 Login(browser(), 1, 0);
1600 FailLoadsAfterLogin(browser(), 1); 1600 FailLoadsAfterLogin(browser(), 1);
1601 } 1601 }
1602 1602
1603 // Checks that two tabs with SSL timeouts in the same window work. Both 1603 // Checks that two tabs with SSL timeouts in the same window work. Both
1604 // tabs only timeout after logging in. 1604 // tabs only timeout after logging in.
1605 IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, TwoBrokenTabs) { 1605 // Disabled due to frame navigation flakiness: See http://crbug.com/141497.
1606 IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, DISABLED_TwoBrokenTabs) {
1606 SlowLoadBehindCaptivePortal(browser(), true); 1607 SlowLoadBehindCaptivePortal(browser(), true);
1607 1608
1608 // Can't set the TabReloader HTTPS timeout on a new tab without doing some 1609 // Can't set the TabReloader HTTPS timeout on a new tab without doing some
1609 // acrobatics, so open a new tab at a normal page, and then navigate it to a 1610 // acrobatics, so open a new tab at a normal page, and then navigate it to a
1610 // timeout. 1611 // timeout.
1611 MultiNavigationObserver navigation_observer; 1612 MultiNavigationObserver navigation_observer;
1612 CaptivePortalObserver portal_observer(browser()->profile()); 1613 CaptivePortalObserver portal_observer(browser()->profile());
1613 ui_test_utils::NavigateToURLWithDisposition( 1614 ui_test_utils::NavigateToURLWithDisposition(
1614 browser(), 1615 browser(),
1615 URLRequestMockHTTPJob::GetMockUrl( 1616 URLRequestMockHTTPJob::GetMockUrl(
(...skipping 380 matching lines...) Expand 10 before | Expand all | Expand 10 after
1996 base::Bind(&AddHstsHost, 1997 base::Bind(&AddHstsHost,
1997 make_scoped_refptr(browser()->profile()->GetRequestContext()), 1998 make_scoped_refptr(browser()->profile()->GetRequestContext()),
1998 http_timeout_url.host())); 1999 http_timeout_url.host()));
1999 2000
2000 SlowLoadBehindCaptivePortal(browser(), true, http_timeout_url); 2001 SlowLoadBehindCaptivePortal(browser(), true, http_timeout_url);
2001 Login(browser(), 1, 0); 2002 Login(browser(), 1, 0);
2002 FailLoadsAfterLogin(browser(), 1); 2003 FailLoadsAfterLogin(browser(), 1);
2003 } 2004 }
2004 2005
2005 } // namespace captive_portal 2006 } // namespace captive_portal
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