Remove HostDesktopType from BrowserList::GetInstance()

chrome/browser/ui/views/profiles/profile_chooser_view_browsertest.cc

 // Copyright 2014 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 "chrome/browser/ui/views/profiles/profile_chooser_view.h"
 
 #include <stddef.h>
 
 #include "base/command_line.h"
 #include "base/macros.h"
@@ skipping 235 matching lines @@
       ProfileMetrics::PROFILE_AVATAR_MENU_UPGRADE_VIEW, 1);
 }
 
 // Flaky: http://crbug.com/450221
 // WaitForUserManager()'s RunUntilIdle isn't always sufficient for the
 // UserManager to be showing.
 IN_PROC_BROWSER_TEST_F(ProfileChooserViewExtensionsTest, DISABLED_LockProfile) {
   ASSERT_TRUE(profiles::IsMultipleProfilesEnabled());
 
   SetupProfilesForLock(browser()->profile());
-  EXPECT_EQ(1U, BrowserList::GetInstance(chrome::GetActiveDesktop())->size());
+  EXPECT_EQ(1U, BrowserList::GetInstance()->size());
 
   ASSERT_NO_FATAL_FAILURE(OpenProfileChooserView(browser()));
   AvatarMenu* menu = GetProfileChooserViewAvatarMenu();
   EXPECT_FALSE(menu->GetItemAt(menu->GetActiveProfileIndex()).signin_required);
 
   ClickProfileChooserViewLockButton();
   EXPECT_TRUE(menu->GetItemAt(menu->GetActiveProfileIndex()).signin_required);
 
   window_close_observer()->Wait();
-  EXPECT_TRUE(BrowserList::GetInstance(chrome::GetActiveDesktop())->empty());
+  EXPECT_TRUE(BrowserList::GetInstance()->empty());
 
   WaitForUserManager();
   // We need to hide the User Manager or else the process can't die.
   UserManager::Hide();
 }
 
 // Flaky: http://crbug.com/450221
 // WaitForUserManager()'s RunUntilIdle isn't always sufficient for the
 // UserManager to be showing.
 IN_PROC_BROWSER_TEST_F(ProfileChooserViewExtensionsTest,
@@ skipping 25 matching lines @@
   // Make sure we have at least one enabled extension.
   extensions::ExtensionRegistry* registry =
       GetPreparedRegistry(browser()->profile());
   const size_t total_enabled_extensions = registry->enabled_extensions().size();
 
   // Create a different profile and then lock it.
   Profile *signed_in = CreateTestingProfile("signed_in");
   SetupProfilesForLock(signed_in);
   extensions::ExtensionSystem::Get(signed_in)->InitForRegularProfile(true);
   Browser* browser_to_lock = CreateBrowser(signed_in);
-  EXPECT_EQ(2U, BrowserList::GetInstance(chrome::GetActiveDesktop())->size());
+  EXPECT_EQ(2U, BrowserList::GetInstance()->size());
 
   ASSERT_NO_FATAL_FAILURE(OpenProfileChooserView(browser_to_lock));
   ClickProfileChooserViewLockButton();
   window_close_observer()->Wait();
-  EXPECT_EQ(1U, BrowserList::GetInstance(chrome::GetActiveDesktop())->size());
+  EXPECT_EQ(1U, BrowserList::GetInstance()->size());
 
   WaitForUserManager();
   // Assert that the first profile's extensions are not blocked.
   ASSERT_EQ(total_enabled_extensions, registry->enabled_extensions().size());
   ASSERT_EQ(0U, registry->blocked_extensions().size());
 
   // We need to hide the User Manager or else the process can't die.
   UserManager::Hide();
 }