OLD | NEW |
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 #include <string> | 7 #include <string> |
8 #include <utility> | 8 #include <utility> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 2650 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2661 | 2661 |
2662 SetSlowSSLLoadTime(tab_reloader, base::TimeDelta::FromDays(1)); | 2662 SetSlowSSLLoadTime(tab_reloader, base::TimeDelta::FromDays(1)); |
2663 Login(browser(), 1, 0); | 2663 Login(browser(), 1, 0); |
2664 FailLoadsAfterLogin(browser(), 1); | 2664 FailLoadsAfterLogin(browser(), 1); |
2665 } | 2665 } |
2666 | 2666 |
2667 // Checks the case where there are two windows, and there's an SSL timeout in | 2667 // Checks the case where there are two windows, and there's an SSL timeout in |
2668 // the background one. | 2668 // the background one. |
2669 // Disabled: http://crbug.com/134357 | 2669 // Disabled: http://crbug.com/134357 |
2670 IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, DISABLED_TwoWindows) { | 2670 IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, DISABLED_TwoWindows) { |
2671 Browser* browser2 = | 2671 Browser* browser2 = new Browser(Browser::CreateParams(browser()->profile())); |
2672 new Browser(Browser::CreateParams(browser()->profile(), | |
2673 browser()->host_desktop_type())); | |
2674 // Navigate the new browser window so it'll be shown and we can pick the | 2672 // Navigate the new browser window so it'll be shown and we can pick the |
2675 // active window. | 2673 // active window. |
2676 ui_test_utils::NavigateToURL(browser2, GURL(url::kAboutBlankURL)); | 2674 ui_test_utils::NavigateToURL(browser2, GURL(url::kAboutBlankURL)); |
2677 | 2675 |
2678 // Generally, |browser2| will be the active window. However, if the | 2676 // Generally, |browser2| will be the active window. However, if the |
2679 // original browser window lost focus before creating the new one, such as | 2677 // original browser window lost focus before creating the new one, such as |
2680 // when running multiple tests at once, the original browser window may | 2678 // when running multiple tests at once, the original browser window may |
2681 // remain the profile's active window. | 2679 // remain the profile's active window. |
2682 Browser* active_browser = | 2680 Browser* active_browser = |
2683 chrome::FindTabbedBrowser(browser()->profile(), true); | 2681 chrome::FindTabbedBrowser(browser()->profile(), true); |
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2838 | 2836 |
2839 EXPECT_EQ(CaptivePortalTabReloader::STATE_NEEDS_RELOAD, | 2837 EXPECT_EQ(CaptivePortalTabReloader::STATE_NEEDS_RELOAD, |
2840 GetStateOfTabReloaderAt(browser(), broken_tab_index)); | 2838 GetStateOfTabReloaderAt(browser(), broken_tab_index)); |
2841 | 2839 |
2842 WaitForInterstitialAttach(broken_tab_contents); | 2840 WaitForInterstitialAttach(broken_tab_contents); |
2843 portal_observer.WaitForResults(1); | 2841 portal_observer.WaitForResults(1); |
2844 | 2842 |
2845 EXPECT_EQ(SSLBlockingPage::kTypeForTesting, | 2843 EXPECT_EQ(SSLBlockingPage::kTypeForTesting, |
2846 GetInterstitialType(broken_tab_contents)); | 2844 GetInterstitialType(broken_tab_contents)); |
2847 } | 2845 } |
OLD | NEW |