Remove HostDesktopType from BrowserList::GetInstance()

chrome/browser/profiles/profile_list_desktop_browsertest.cc

 // Copyright (c) 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 <stddef.h>
 
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "build/build_config.h"
 #include "chrome/browser/chrome_notification_types.h"
@@ skipping 51 matching lines @@
     return;
 
   ProfileManager* profile_manager = g_browser_process->profile_manager();
   Profile* current_profile = browser()->profile();
   ProfileInfoCache& cache = profile_manager->GetProfileInfoCache();
   size_t index = cache.GetIndexOfProfileWithPath(current_profile->GetPath());
 
   scoped_ptr<AvatarMenu> menu = CreateAvatarMenu(&cache);
   menu->RebuildMenu();
 
-  BrowserList* browser_list =
-      BrowserList::GetInstance(chrome::GetActiveDesktop());
+  BrowserList* browser_list = BrowserList::GetInstance();
   EXPECT_EQ(1U, browser_list->size());
   content::WindowedNotificationObserver window_close_observer(
       chrome::NOTIFICATION_BROWSER_CLOSED,
       content::Source<Browser>(browser()));
 
   EXPECT_FALSE(cache.ProfileIsSigninRequiredAtIndex(index));
   profiles::LockProfile(current_profile);
   window_close_observer.Wait();  // rely on test time-out for failure indication
 
   EXPECT_TRUE(cache.ProfileIsSigninRequiredAtIndex(index));
@@ skipping 35 matching lines @@
                                       base::string16(), std::string(),
                                       std::string());
 
   // Spin to allow profile creation to take place, loop is terminated
   // by OnUnblockOnProfileCreation when the profile is created.
   content::RunMessageLoop();
   ASSERT_EQ(cache.GetNumberOfProfiles(), 2U);
 
   scoped_ptr<AvatarMenu> menu = CreateAvatarMenu(&cache);
   menu->RebuildMenu();
-  BrowserList* browser_list =
-      BrowserList::GetInstance(chrome::GetActiveDesktop());
+  BrowserList* browser_list = BrowserList::GetInstance();
   EXPECT_EQ(1U, browser_list->size());
   EXPECT_EQ(path_profile1, browser_list->get(0)->profile()->GetPath());
 
   // Open a browser window for the first profile.
   menu->SwitchToProfile(cache.GetIndexOfProfileWithPath(path_profile1),
                         false, ProfileMetrics::SWITCH_PROFILE_ICON);
   EXPECT_EQ(1U, browser_list->size());
   EXPECT_EQ(path_profile1, browser_list->get(0)->profile()->GetPath());
 
   // Open a browser window for the second profile.
   menu->SwitchToProfile(cache.GetIndexOfProfileWithPath(path_profile2),
                         false, ProfileMetrics::SWITCH_PROFILE_ICON);
   EXPECT_EQ(2U, browser_list->size());
 
   // Switch to the first profile without opening a new window.
   menu->SwitchToProfile(cache.GetIndexOfProfileWithPath(path_profile1),
                         false, ProfileMetrics::SWITCH_PROFILE_ICON);
   EXPECT_EQ(2U, browser_list->size());
   EXPECT_EQ(path_profile1, browser_list->get(0)->profile()->GetPath());
   EXPECT_EQ(path_profile2, browser_list->get(1)->profile()->GetPath());
 }