Add desktop type context to most existing instances of FindTabbedBrowser.

chrome/browser/captive_portal/captive_portal_browsertest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <map>
 #include <set>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 2039 matching lines @@
   Browser* browser2 = new Browser(Browser::CreateParams(browser()->profile()));
   // Navigate the new browser window so it'll be shown and we can pick the
   // active window.
   ui_test_utils::NavigateToURL(browser2, GURL(chrome::kAboutBlankURL));
 
   // Generally, |browser2| will be the active window.  However, if the
   // original browser window lost focus before creating the new one, such as
   // when running multiple tests at once, the original browser window may
   // remain the profile's active window.
   Browser* active_browser =
-      browser::FindTabbedBrowser(browser()->profile(), true);
+      browser::FindTabbedBrowser(browser()->profile(), true,
+                                 browser()->host_desktop_type());
   Browser* inactive_browser;
   if (active_browser == browser2) {
     // When only one test is running at a time, the new browser will probably be
     // on top, but when multiple tests are running at once, this is not
     // guaranteed.
     inactive_browser = browser();
   } else {
     ASSERT_EQ(active_browser, browser());
     inactive_browser = browser2;
   }
 
   CaptivePortalObserver portal_observer(browser()->profile());
   MultiNavigationObserver navigation_observer;
 
   // Navigate the tab in the inactive browser to an SSL timeout.  Have to use
   // chrome::NavigateParams and NEW_BACKGROUND_TAB to avoid activating the
   // window.
   chrome::NavigateParams params(inactive_browser,
                                 GURL(kMockHttpsQuickTimeoutUrl),
                                 content::PAGE_TRANSITION_TYPED);
   params.disposition = NEW_BACKGROUND_TAB;
   params.window_action = chrome::NavigateParams::NO_ACTION;
   ui_test_utils::NavigateToURL(&params);
   navigation_observer.WaitForNavigations(2);
 
   // Make sure the active window hasn't changed, and its new tab is
   // active.
   ASSERT_EQ(active_browser,
-            browser::FindTabbedBrowser(browser()->profile(), true));
+            browser::FindTabbedBrowser(browser()->profile(), true,
+                                       browser()->host_desktop_type()));
   ASSERT_EQ(1, active_browser->active_index());
 
   // Check that the only two navigated tabs were the new error tab in the
   // backround windows, and the login tab in the active window.
   EXPECT_EQ(1, navigation_observer.NumNavigationsForTab(
                    chrome::GetWebContentsAt(inactive_browser, 1)));
   EXPECT_EQ(1, navigation_observer.NumNavigationsForTab(
                    chrome::GetWebContentsAt(active_browser, 1)));
   EXPECT_EQ(0, NumLoadingTabs());
 
@@ skipping 79 matching lines @@
       base::Bind(&AddHstsHost,
                  make_scoped_refptr(browser()->profile()->GetRequestContext()),
                  http_timeout_url.host()));
 
   SlowLoadBehindCaptivePortal(browser(), true, http_timeout_url, 1, 1);
   Login(browser(), 1, 0);
   FailLoadsAfterLogin(browser(), 1);
 }
 
 }  // namespace captive_portal