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

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

Issue 11876040: Disable flaky CaptivePortalBrowserTest on Windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 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 1876 matching lines...) Expand 10 before | Expand all | Expand 10 after
1887 // navigation is cancelled by a navigation to the same site. 1887 // navigation is cancelled by a navigation to the same site.
1888 IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, 1888 IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest,
1889 NavigateLoadingTabToTimeoutSingleSite) { 1889 NavigateLoadingTabToTimeoutSingleSite) {
1890 RunNavigateLoadingTabToTimeoutTest( 1890 RunNavigateLoadingTabToTimeoutTest(
1891 browser(), 1891 browser(),
1892 GURL(kMockHttpsUrl), 1892 GURL(kMockHttpsUrl),
1893 GURL(kMockHttpsUrl), 1893 GURL(kMockHttpsUrl),
1894 GURL(kMockHttpsUrl)); 1894 GURL(kMockHttpsUrl));
1895 } 1895 }
1896 1896
1897 // Fails on Windows only, mostly on Win7. http://crbug.com/170033
1898 #if defined(OS_WIN)
1899 #define MAYBE_NavigateLoadingTabToTimeoutTwoSites \
1900 DISABLED_NavigateLoadingTabToTimeoutTwoSites
1901 #else
1902 #define MAYBE_NavigateLoadingTabToTimeoutTwoSites \
1903 NavigateLoadingTabToTimeoutTwoSites
1904 #endif
1905
1897 // Checks that captive portal detection triggers correctly when a same-site 1906 // Checks that captive portal detection triggers correctly when a same-site
1898 // navigation is cancelled by a navigation to another site. 1907 // navigation is cancelled by a navigation to another site.
1899 IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, 1908 IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest,
1900 NavigateLoadingTabToTimeoutTwoSites) { 1909 MAYBE_NavigateLoadingTabToTimeoutTwoSites) {
1901 RunNavigateLoadingTabToTimeoutTest( 1910 RunNavigateLoadingTabToTimeoutTest(
1902 browser(), 1911 browser(),
1903 GURL(kMockHttpsUrl), 1912 GURL(kMockHttpsUrl),
1904 GURL(kMockHttpsUrl), 1913 GURL(kMockHttpsUrl),
1905 GURL(kMockHttpsUrl2)); 1914 GURL(kMockHttpsUrl2));
1906 } 1915 }
1907 1916
1908 // Checks that captive portal detection triggers correctly when a cross-site 1917 // Checks that captive portal detection triggers correctly when a cross-site
1909 // navigation is cancelled by a navigation to yet another site. 1918 // navigation is cancelled by a navigation to yet another site.
1910 IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, 1919 IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest,
(...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after
2194 base::Bind(&AddHstsHost, 2203 base::Bind(&AddHstsHost,
2195 make_scoped_refptr(browser()->profile()->GetRequestContext()), 2204 make_scoped_refptr(browser()->profile()->GetRequestContext()),
2196 http_timeout_url.host())); 2205 http_timeout_url.host()));
2197 2206
2198 SlowLoadBehindCaptivePortal(browser(), true, http_timeout_url, 1, 1); 2207 SlowLoadBehindCaptivePortal(browser(), true, http_timeout_url, 1, 1);
2199 Login(browser(), 1, 0); 2208 Login(browser(), 1, 0);
2200 FailLoadsAfterLogin(browser(), 1); 2209 FailLoadsAfterLogin(browser(), 1);
2201 } 2210 }
2202 2211
2203 } // namespace captive_portal 2212 } // 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