Remove kDefaultHostDesktopType from browser_finder.cc.

chrome/browser/extensions/window_open_apitest.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 "base/command_line.h"
 #include "base/memory/scoped_vector.h"
 #include "base/stringprintf.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
@@ skipping 55 matching lines @@
   SCOPED_TRACE(
       StringPrintf("WaitForTabsAndPopups tabs:%d, popups:%d, panels:%d",
                    num_tabs, num_popups, num_panels));
   // We start with one tab and one browser already open.
   ++num_tabs;
   size_t num_browsers = static_cast<size_t>(num_popups) + 1;
 
   const base::TimeDelta kWaitTime = base::TimeDelta::FromSeconds(10);
   base::TimeTicks end_time = base::TimeTicks::Now() + kWaitTime;
   while (base::TimeTicks::Now() < end_time) {
-    if (chrome::GetBrowserCount(browser->profile()) == num_browsers &&
+    if (chrome::GetBrowserCount(browser->profile(),
+                                browser->host_desktop_type()) == num_browsers &&
         browser->tab_strip_model()->count() == num_tabs &&
         GetPanelCount(browser) == num_panels)
       break;
 
     content::RunAllPendingInMessageLoop();
   }
 
-  EXPECT_EQ(num_browsers, chrome::GetBrowserCount(browser->profile()));
+  EXPECT_EQ(num_browsers,
+            chrome::GetBrowserCount(browser->profile(),
+                                    browser->host_desktop_type()));
   EXPECT_EQ(num_tabs, browser->tab_strip_model()->count());
   EXPECT_EQ(num_panels, GetPanelCount(browser));
 
   int num_popups_seen = 0;
   for (chrome::BrowserIterator iter; !iter.done(); iter.Next()) {
     if (*iter == browser)
       continue;
 
     // Check for TYPE_POPUP.
 #if defined(USE_ASH_PANELS)
     // On Ash, panel windows may open as popup windows.
     EXPECT_TRUE((*iter)->is_type_popup() || (*iter)->is_type_panel());
 #else
     EXPECT_TRUE((*iter)->is_type_popup());
 #endif
     ++num_popups_seen;
   }
   EXPECT_EQ(num_popups, num_popups_seen);
 
-  return ((num_browsers == chrome::GetBrowserCount(browser->profile())) &&
+  return ((num_browsers ==
+               chrome::GetBrowserCount(browser->profile(),
+                                       browser->host_desktop_type())) &&
           (num_tabs == browser->tab_strip_model()->count()) &&
           (num_panels == GetPanelCount(browser)) &&
           (num_popups == num_popups_seen));
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, BrowserIsApp) {
   host_resolver()->AddRule("a.com", "127.0.0.1");
   ASSERT_TRUE(StartTestServer());
   ASSERT_TRUE(LoadExtension(
       test_data_dir_.AppendASCII("window_open").AppendASCII("browser_is_app")));
@@ skipping 333 matching lines @@
       OpenWindow(browser()->tab_strip_model()->GetActiveWebContents(),
       GURL(std::string("chrome-extension://") + last_loaded_extension_id_ +
           "/newtab.html"), false, &newtab));
 
   // Extension API should succeed.
   bool result = false;
   ASSERT_TRUE(content::ExecuteScriptAndExtractBool(newtab, "testExtensionApi()",
                                                    &result));
   EXPECT_TRUE(result);
 }