Remove kDefaultHostDesktopType from browser_finder.cc.

chrome/browser/chrome_main_browsertest.cc

Index: chrome/browser/chrome_main_browsertest.cc
diff --git a/chrome/browser/chrome_main_browsertest.cc b/chrome/browser/chrome_main_browsertest.cc
index 0ea403baa9f95607063cb5b3d896bee91e872e4b..c194e55f258489fa1dfb8516166ec7a44959462f 100644
--- a/chrome/browser/chrome_main_browsertest.cc
+++ b/chrome/browser/chrome_main_browsertest.cc
@@ -41,7 +41,8 @@ IN_PROC_BROWSER_TEST_F(ChromeMainTest, SecondLaunch) {
   ui_test_utils::BrowserAddedObserver observer;
   Relaunch(GetCommandLineForRelaunch());
   observer.WaitForSingleNewBrowser();
-  ASSERT_EQ(2u, chrome::GetBrowserCount(browser()->profile()));
+  ASSERT_EQ(2u, chrome::GetBrowserCount(browser()->profile(),
+                                        browser()->host_desktop_type()));
 }
 
 IN_PROC_BROWSER_TEST_F(ChromeMainTest, ReuseBrowserInstanceWhenOpeningFile) {
@@ -71,7 +72,8 @@ IN_PROC_BROWSER_TEST_F(ChromeMainTest, ReuseBrowserInstanceWhenOpeningFile) {
 
 IN_PROC_BROWSER_TEST_F(ChromeMainTest, MAYBE_SecondLaunchWithIncognitoUrl) {
   // We should start with one normal window.
-  ASSERT_EQ(1u, chrome::GetTabbedBrowserCount(browser()->profile()));
+  ASSERT_EQ(1u, chrome::GetTabbedBrowserCount(browser()->profile(),
+                                              browser()->host_desktop_type()));
 
   // Run with --incognito switch and an URL specified.
   base::FilePath test_file_path = ui_test_utils::GetTestFilePath(
@@ -88,21 +90,25 @@ IN_PROC_BROWSER_TEST_F(ChromeMainTest, MAYBE_SecondLaunchWithIncognitoUrl) {
   observer.WaitForSingleNewBrowser();
   ASSERT_EQ(2u, chrome::GetTotalBrowserCount());
 
-  ASSERT_EQ(1u, chrome::GetTabbedBrowserCount(browser()->profile()));
+  ASSERT_EQ(1u, chrome::GetTabbedBrowserCount(browser()->profile(),
+                                              browser()->host_desktop_type()));
 }
 
 IN_PROC_BROWSER_TEST_F(ChromeMainTest, SecondLaunchFromIncognitoWithNormalUrl) {
   // We should start with one normal window.
-  ASSERT_EQ(1u, chrome::GetTabbedBrowserCount(browser()->profile()));
+  ASSERT_EQ(1u, chrome::GetTabbedBrowserCount(browser()->profile(),
+                                              browser()->host_desktop_type()));
 
   // Create an incognito window.
   chrome::NewIncognitoWindow(browser());
 
   ASSERT_EQ(2u, chrome::GetTotalBrowserCount());
-  ASSERT_EQ(1u, chrome::GetTabbedBrowserCount(browser()->profile()));
+  ASSERT_EQ(1u, chrome::GetTabbedBrowserCount(browser()->profile(),
+                                              browser()->host_desktop_type()));
 
   // Close the first window.
   Profile* profile = browser()->profile();
+  chrome::HostDesktopType host_desktop_type = browser()->host_desktop_type();
   content::WindowedNotificationObserver observer(
         chrome::NOTIFICATION_BROWSER_CLOSED,
         content::NotificationService::AllSources());
@@ -111,7 +117,7 @@ IN_PROC_BROWSER_TEST_F(ChromeMainTest, SecondLaunchFromIncognitoWithNormalUrl) {
 
   // There should only be the incognito window open now.
   ASSERT_EQ(1u, chrome::GetTotalBrowserCount());
-  ASSERT_EQ(0u, chrome::GetTabbedBrowserCount(profile));
+  ASSERT_EQ(0u, chrome::GetTabbedBrowserCount(profile, host_desktop_type));
 
   // Run with just an URL specified, no --incognito switch.
   base::FilePath test_file_path = ui_test_utils::GetTestFilePath(
@@ -126,7 +132,7 @@ IN_PROC_BROWSER_TEST_F(ChromeMainTest, SecondLaunchFromIncognitoWithNormalUrl) {
 
   // There should be one normal and one incognito window now.
   ASSERT_EQ(2u, chrome::GetTotalBrowserCount());
-  ASSERT_EQ(1u, chrome::GetTabbedBrowserCount(profile));
+  ASSERT_EQ(1u, chrome::GetTabbedBrowserCount(profile, host_desktop_type));
 }
 
 #endif  // !OS_MACOSX