Remove kDefaultHostDesktopType from browser_finder.cc.

chrome/browser/ui/panels/panel_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 "base/bind.h"
 #include "base/prefs/pref_service.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/devtools/devtools_window.h"
 #include "chrome/browser/extensions/extension_apitest.h"
@@ skipping 1683 matching lines @@
   // Create a test panel with web contents loaded.
   CreatePanelParams params("1", gfx::Rect(0, 0, 200, 220), SHOW_AS_ACTIVE);
   GURL url(ui_test_utils::GetTestUrl(
       base::FilePath(kTestDir),
       base::FilePath(FILE_PATH_LITERAL("update-preferred-size.html"))));
   params.url = url;
   Panel* panel = CreatePanelWithParams(params);
 
   // Open devtools.
   size_t num_browsers = 1;
-  EXPECT_EQ(num_browsers, chrome::GetBrowserCount(browser()->profile()));
+  EXPECT_EQ(num_browsers, chrome::GetBrowserCount(
+                              browser()->profile(),
+                              browser()->host_desktop_type()));
   content::WindowedNotificationObserver signal(
       chrome::NOTIFICATION_BROWSER_WINDOW_READY,
       content::NotificationService::AllSources());
   EXPECT_TRUE(panel->ExecuteCommandIfEnabled(IDC_DEV_TOOLS));
   signal.Wait();
 
   // Check that the new browser window that opened is dev tools window.
   ++num_browsers;
-  EXPECT_EQ(num_browsers, chrome::GetBrowserCount(browser()->profile()));
+  EXPECT_EQ(num_browsers, chrome::GetBrowserCount(
+                              browser()->profile(),
+                              browser()->host_desktop_type()));
   for (chrome::BrowserIterator iter; !iter.done(); iter.Next()) {
     if (*iter == browser())
       continue;
     ASSERT_TRUE((*iter)->is_devtools());
   }
 
   panel->Close();
 }
 
 // http://crbug.com/175760; several panel tests failing regularly on mac.
 #if defined(OS_MACOSX)
 #define MAYBE_DevToolsConsole DISABLED_DevToolsConsole
 #else
 #define MAYBE_DevToolsConsole DevToolsConsole
 #endif
 IN_PROC_BROWSER_TEST_F(PanelBrowserTest, DevToolsConsole) {
   // Create a test panel with web contents loaded.
   CreatePanelParams params("1", gfx::Rect(0, 0, 200, 220), SHOW_AS_ACTIVE);
   GURL url(ui_test_utils::GetTestUrl(
       base::FilePath(kTestDir),
       base::FilePath(FILE_PATH_LITERAL("update-preferred-size.html"))));
   params.url = url;
   Panel* panel = CreatePanelWithParams(params);
 
   // Open devtools console.
   size_t num_browsers = 1;
-  EXPECT_EQ(num_browsers, chrome::GetBrowserCount(browser()->profile()));
+  EXPECT_EQ(num_browsers, chrome::GetBrowserCount(
+                              browser()->profile(),
+                              browser()->host_desktop_type()));
   content::WindowedNotificationObserver signal(
       chrome::NOTIFICATION_BROWSER_WINDOW_READY,
       content::NotificationService::AllSources());
   EXPECT_TRUE(panel->ExecuteCommandIfEnabled(IDC_DEV_TOOLS_CONSOLE));
   signal.Wait();
 
   // Check that the new browser window that opened is dev tools window.
   ++num_browsers;
-  EXPECT_EQ(num_browsers, chrome::GetBrowserCount(browser()->profile()));
+  EXPECT_EQ(num_browsers, chrome::GetBrowserCount(
+                              browser()->profile(),
+                              browser()->host_desktop_type()));
   for (chrome::BrowserIterator iter; !iter.done(); iter.Next()) {
     if (*iter == browser())
       continue;
     ASSERT_TRUE((*iter)->is_devtools());
   }
 
   panel->Close();
 }
 
 #if defined(OS_WIN)
@@ skipping 53 matching lines @@
 #else
 #define MAYBE_FocusChangeEventOnMinimize FocusChangeEventOnMinimize
 #endif
 IN_PROC_BROWSER_TEST_F(PanelExtensionApiTest,
                        MAYBE_FocusChangeEventOnMinimize) {
   // This is needed so the subsequently created panels can be activated.
   // On a Mac, it transforms background-only test process into foreground one.
   ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
   ASSERT_TRUE(RunExtensionTest("panels/focus_change_on_minimize")) << message_;
 }