Remove HostDesktopType from BrowserList::GetInstance()

chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc

 // Copyright 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 "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 
 #include <stddef.h>
 
 #include "ash/ash_switches.h"
 #include "ash/shelf/shelf.h"
@@ skipping 1615 matching lines @@
   TabStripModel* tab_strip = browser()->tab_strip_model();
   int tab_count1 = tab_strip->count();
   TabStripModel* tab_strip2 = browser2->tab_strip_model();
   int tab_count2 = tab_strip2->count();
 
   // Check that we have two browsers and the inactive browser remained inactive.
   EXPECT_EQ(2u, chrome::GetTotalBrowserCount());
   EXPECT_EQ(chrome::FindBrowserWithWindow(ash::wm::GetActiveWindow()),
             browser());
   // Check that the LRU browser list does only contain the original browser.
-  BrowserList* ash_browser_list =
-      BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_ASH);
-  BrowserList::const_reverse_iterator it =
-      ash_browser_list->begin_last_active();
+  BrowserList* browser_list = BrowserList::GetInstance();
+  BrowserList::const_reverse_iterator it = browser_list->begin_last_active();
   EXPECT_EQ(*it, browser());
   ++it;
-  EXPECT_EQ(it, ash_browser_list->end_last_active());
+  EXPECT_EQ(it, browser_list->end_last_active());
 
   // Now request to either activate an existing app or create a new one.
   LauncherItemController* item_controller =
       controller_->GetLauncherItemController(shortcut_id);
   item_controller->ItemSelected(ui::KeyEvent(ui::ET_KEY_RELEASED,
                                         ui::VKEY_RETURN,
                                         ui::EF_NONE));
 
   // Check that we have set focus on the existing application and nothing new
   // was created.
@@ skipping 490 matching lines @@
   // Create a windowed application.
   AppLaunchParams params(
       profile(), controller_->GetExtensionForAppID(extensions::kWebStoreAppId),
       CURRENT_TAB, chrome::HOST_DESKTOP_TYPE_ASH, extensions::SOURCE_TEST);
   params.container = extensions::LAUNCH_CONTAINER_WINDOW;
   OpenApplication(params);
   EXPECT_EQ(ash::STATUS_ACTIVE, model_->ItemByID(id)->status);
 
   // Find the browser which holds our app.
   Browser* app_browser = NULL;
-  const BrowserList* ash_browser_list =
-      BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_ASH);
+  const BrowserList* browser_list = BrowserList::GetInstance();
   for (BrowserList::const_reverse_iterator it =
-           ash_browser_list->begin_last_active();
-       it != ash_browser_list->end_last_active() && !app_browser; ++it) {
+           browser_list->begin_last_active();
+       it != browser_list->end_last_active() && !app_browser; ++it) {
     if ((*it)->is_app()) {
       app_browser = *it;
       break;
     }
   }
   ASSERT_TRUE(app_browser);
 
   // After navigating away in the app, we should still be active.
   ui_test_utils::NavigateToURL(app_browser,
                                GURL("http://www.foo.com/bar.html"));
@@ skipping 124 matching lines @@
   controller_->ActivateApp(bookmark_app->id(), ash::LAUNCH_FROM_APP_LIST, 0);
 
   // There should be two new browsers.
   EXPECT_EQ(3u, chrome::GetTotalBrowserCountForProfile(browser()->profile()));
 
   // The apps should now be running, with the last opened app active.
   EXPECT_EQ(ash::STATUS_RUNNING, model_->ItemByID(hosted_app_shelf_id)->status);
   EXPECT_EQ(ash::STATUS_ACTIVE,
             model_->ItemByID(bookmark_app_shelf_id)->status);
 }