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