| 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 | 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 2046 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2057 | 2057 |
| 2058 // Checks the case where there are two windows, and there's an SSL timeout in | 2058 // Checks the case where there are two windows, and there's an SSL timeout in |
| 2059 // the background one. | 2059 // the background one. |
| 2060 // Disabled: http://crbug.com/134357 | 2060 // Disabled: http://crbug.com/134357 |
| 2061 IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, DISABLED_TwoWindows) { | 2061 IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, DISABLED_TwoWindows) { |
| 2062 Browser* browser2 = | 2062 Browser* browser2 = |
| 2063 new Browser(Browser::CreateParams(browser()->profile(), | 2063 new Browser(Browser::CreateParams(browser()->profile(), |
| 2064 browser()->host_desktop_type())); | 2064 browser()->host_desktop_type())); |
| 2065 // Navigate the new browser window so it'll be shown and we can pick the | 2065 // Navigate the new browser window so it'll be shown and we can pick the |
| 2066 // active window. | 2066 // active window. |
| 2067 ui_test_utils::NavigateToURL(browser2, GURL(content::kAboutBlankURL)); | 2067 ui_test_utils::NavigateToURL(browser2, GURL(url::kAboutBlankURL)); |
| 2068 | 2068 |
| 2069 // Generally, |browser2| will be the active window. However, if the | 2069 // Generally, |browser2| will be the active window. However, if the |
| 2070 // original browser window lost focus before creating the new one, such as | 2070 // original browser window lost focus before creating the new one, such as |
| 2071 // when running multiple tests at once, the original browser window may | 2071 // when running multiple tests at once, the original browser window may |
| 2072 // remain the profile's active window. | 2072 // remain the profile's active window. |
| 2073 Browser* active_browser = | 2073 Browser* active_browser = |
| 2074 chrome::FindTabbedBrowser(browser()->profile(), true, | 2074 chrome::FindTabbedBrowser(browser()->profile(), true, |
| 2075 browser()->host_desktop_type()); | 2075 browser()->host_desktop_type()); |
| 2076 Browser* inactive_browser; | 2076 Browser* inactive_browser; |
| 2077 if (active_browser == browser2) { | 2077 if (active_browser == browser2) { |
| (...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2194 content::BrowserThread::PostTask( | 2194 content::BrowserThread::PostTask( |
| 2195 content::BrowserThread::IO, FROM_HERE, | 2195 content::BrowserThread::IO, FROM_HERE, |
| 2196 base::Bind(&AddHstsHost, | 2196 base::Bind(&AddHstsHost, |
| 2197 make_scoped_refptr(browser()->profile()->GetRequestContext()), | 2197 make_scoped_refptr(browser()->profile()->GetRequestContext()), |
| 2198 http_timeout_url.host())); | 2198 http_timeout_url.host())); |
| 2199 | 2199 |
| 2200 SlowLoadBehindCaptivePortal(browser(), true, http_timeout_url, 1, 1); | 2200 SlowLoadBehindCaptivePortal(browser(), true, http_timeout_url, 1, 1); |
| 2201 Login(browser(), 1, 0); | 2201 Login(browser(), 1, 0); |
| 2202 FailLoadsAfterLogin(browser(), 1); | 2202 FailLoadsAfterLogin(browser(), 1); |
| 2203 } | 2203 } |
| OLD | NEW |