Remove the rest of HostDesktopType from c/b/ui/browser_finder.h

chrome/browser/ui/blocked_content/popup_blocker_browsertest.cc

 // Copyright 2013 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 <stdint.h>
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 162 matching lines @@
 
   void NavigateAndCheckPopupShown(const GURL& url,
                                   WhatToExpect what_to_expect) {
     content::WindowedNotificationObserver observer(
         chrome::NOTIFICATION_TAB_ADDED,
         content::NotificationService::AllSources());
     ui_test_utils::NavigateToURL(browser(), url);
     observer.Wait();
 
     if (what_to_expect == ExpectPopup) {
-      ASSERT_EQ(2u,
-                chrome::GetBrowserCount(browser()->profile(),
-                                        browser()->host_desktop_type()));
+      ASSERT_EQ(2u, chrome::GetBrowserCount(browser()->profile()));
     } else {
-      ASSERT_EQ(1u,
-                chrome::GetBrowserCount(browser()->profile(),
-                                        browser()->host_desktop_type()));
+      ASSERT_EQ(1u, chrome::GetBrowserCount(browser()->profile()));
       ASSERT_EQ(2, browser()->tab_strip_model()->count());
 
       // Check that we always create foreground tabs.
       ASSERT_EQ(1, browser()->tab_strip_model()->active_index());
     }
 
     ASSERT_EQ(0, GetBlockedContentsCount());
   }
 
   // Navigates to the test indicated by |test_name| using |browser| which is
@@ skipping 10 matching lines @@
                             WhatToExpect what_to_expect,
                             ShouldCheckTitle check_title) {
     GURL url(embedded_test_server()->GetURL(test_name));
 
     CountRenderViewHosts counter;
 
     ui_test_utils::NavigateToURL(browser, url);
 
     // Since the popup blocker blocked the window.open, there should be only one
     // tab.
-    EXPECT_EQ(1u, chrome::GetBrowserCount(browser->profile(),
-                                          browser->host_desktop_type()));
+    EXPECT_EQ(1u, chrome::GetBrowserCount(browser->profile()));
     EXPECT_EQ(1, browser->tab_strip_model()->count());
     WebContents* web_contents =
         browser->tab_strip_model()->GetActiveWebContents();
     EXPECT_EQ(url, web_contents->GetURL());
 
     // And no new RVH created.
     EXPECT_EQ(0, counter.GetRenderViewHostCreatedCount());
 
     content::WindowedNotificationObserver observer(
         chrome::NOTIFICATION_TAB_ADDED,
@@ skipping 318 matching lines @@
 
   GURL url(
       embedded_test_server()->GetURL("/popup_blocker/popup-on-unload.html"));
   ui_test_utils::NavigateToURL(browser(), url);
 
   WebContents* tab = browser()->tab_strip_model()->GetActiveWebContents();
 
   tab->GetController().GoBack();
   content::WaitForLoadStop(tab);
 
-  ASSERT_EQ(1u, chrome::GetBrowserCount(browser()->profile(),
-                                        browser()->host_desktop_type()));
+  ASSERT_EQ(1u, chrome::GetBrowserCount(browser()->profile()));
   ASSERT_EQ(1, browser()->tab_strip_model()->count());
 
   // The popup from the unload event handler should not show up for about:blank.
   ASSERT_EQ(0, GetBlockedContentsCount());
 }
 
 // Verify that app modal prompts can't be used to create pop unders.
 IN_PROC_BROWSER_TEST_F(PopupBlockerBrowserTest, ModalPopUnder) {
   WebContents* tab = browser()->tab_strip_model()->GetActiveWebContents();
   GURL url(
@@ skipping 99 matching lines @@
       ui::KeycodeConverter::DomCodeToNativeKeycode(ui::DomCode::OS_LEFT),
       modifiers);
 #else
   InjectRawKeyEvent(
       tab, blink::WebInputEvent::KeyUp, ui::VKEY_CONTROL,
       ui::KeycodeConverter::DomCodeToNativeKeycode(ui::DomCode::CONTROL_LEFT),
       modifiers);
 #endif
   wait_for_new_tab.Wait();
 
-  ASSERT_EQ(1u, chrome::GetBrowserCount(browser()->profile(),
-                                        browser()->host_desktop_type()));
+  ASSERT_EQ(1u, chrome::GetBrowserCount(browser()->profile()));
   ASSERT_EQ(2, browser()->tab_strip_model()->count());
   // Check that we create the background tab.
   ASSERT_EQ(0, browser()->tab_strip_model()->active_index());
 }
 
 // Tests that the tapping gesture with cntl/cmd key on a link open the
 // backgournd tab.
 IN_PROC_BROWSER_TEST_F(PopupBlockerBrowserTest, TapGestureWithCtrlKey) {
   WebContents* tab = browser()->tab_strip_model()->GetActiveWebContents();
 
   GURL url(embedded_test_server()->GetURL(
       "/popup_blocker/popup-simulated-click-on-anchor2.html"));
   ui_test_utils::NavigateToURL(browser(), url);
 
   content::WindowedNotificationObserver wait_for_new_tab(
       chrome::NOTIFICATION_TAB_ADDED,
       content::NotificationService::AllSources());
 
 #if defined(OS_MACOSX)
   unsigned modifiers = blink::WebInputEvent::MetaKey;
 #else
   unsigned modifiers = blink::WebInputEvent::ControlKey;
 #endif
   content::SimulateTapWithModifiersAt(tab, modifiers, gfx::Point(350, 250));
 
   wait_for_new_tab.Wait();
 
-  ASSERT_EQ(1u, chrome::GetBrowserCount(browser()->profile(),
-                                        browser()->host_desktop_type()));
+  ASSERT_EQ(1u, chrome::GetBrowserCount(browser()->profile()));
   ASSERT_EQ(2, browser()->tab_strip_model()->count());
   // Check that we create the background tab.
   ASSERT_EQ(0, browser()->tab_strip_model()->active_index());
 }
 
 }  // namespace