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

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

Issue 10692195: Consolidate Browser Creation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 5 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
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 1858 matching lines...) Expand 10 before | Expand all | Expand 10 after
1869 1869
1870 SetSlowSSLLoadTime(tab_reloader, base::TimeDelta::FromDays(1)); 1870 SetSlowSSLLoadTime(tab_reloader, base::TimeDelta::FromDays(1));
1871 Login(browser(), 1, 0); 1871 Login(browser(), 1, 0);
1872 FailLoadsAfterLogin(browser(), 1); 1872 FailLoadsAfterLogin(browser(), 1);
1873 } 1873 }
1874 1874
1875 // Checks the case where there are two windows, and there's an SSL timeout in 1875 // Checks the case where there are two windows, and there's an SSL timeout in
1876 // the background one. 1876 // the background one.
1877 // Disabled: http://crbug.com/134357 1877 // Disabled: http://crbug.com/134357
1878 IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, DISABLED_TwoWindows) { 1878 IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, DISABLED_TwoWindows) {
1879 Browser* browser2 = Browser::Create(browser()->profile()); 1879 Browser* browser2 = new Browser(Browser::CreateParams(browser()->profile()));
1880 // Navigate the new browser window so it'll be shown and we can pick the 1880 // Navigate the new browser window so it'll be shown and we can pick the
1881 // active window. 1881 // active window.
1882 ui_test_utils::NavigateToURL(browser2, GURL(chrome::kAboutBlankURL)); 1882 ui_test_utils::NavigateToURL(browser2, GURL(chrome::kAboutBlankURL));
1883 1883
1884 // Generally, |browser2| will be the active window. However, if the 1884 // Generally, |browser2| will be the active window. However, if the
1885 // original browser window lost focus before creating the new one, such as 1885 // original browser window lost focus before creating the new one, such as
1886 // when running multiple tests at once, the original browser window may 1886 // when running multiple tests at once, the original browser window may
1887 // remain the profile's active window. 1887 // remain the profile's active window.
1888 Browser* active_browser = 1888 Browser* active_browser =
1889 browser::FindTabbedBrowser(browser()->profile(), true); 1889 browser::FindTabbedBrowser(browser()->profile(), true);
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
1997 base::Bind(&AddHstsHost, 1997 base::Bind(&AddHstsHost,
1998 make_scoped_refptr(browser()->profile()->GetRequestContext()), 1998 make_scoped_refptr(browser()->profile()->GetRequestContext()),
1999 http_timeout_url.host())); 1999 http_timeout_url.host()));
2000 2000
2001 SlowLoadBehindCaptivePortal(browser(), true, http_timeout_url); 2001 SlowLoadBehindCaptivePortal(browser(), true, http_timeout_url);
2002 Login(browser(), 1, 0); 2002 Login(browser(), 1, 0);
2003 FailLoadsAfterLogin(browser(), 1); 2003 FailLoadsAfterLogin(browser(), 1);
2004 } 2004 }
2005 2005
2006 } // namespace captive_portal 2006 } // namespace captive_portal
OLDNEW
« no previous file with comments | « chrome/browser/browser_focus_uitest.cc ('k') | chrome/browser/chromeos/enrollment_dialog_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698