Change GetBrowserItemIndex() to GetLauncherItemIndexForType()

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

Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc
index baab6169e42ee583291e14c18fc517c8364ae069..b5cf6f6a79d2648eb23ae5eddc641454040e782c 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc
@@ -1033,7 +1033,8 @@ IN_PROC_BROWSER_TEST_F(LauncherAppBrowserTest, Navigation) {
 IN_PROC_BROWSER_TEST_F(LauncherAppBrowserTest, TabDragAndDrop) {
   TabStripModel* tab_strip_model1 = browser()->tab_strip_model();
   EXPECT_EQ(1, tab_strip_model1->count());
-  int browser_index = ash::GetBrowserItemIndex(*model_);
+  int browser_index =
+      ash::GetLauncherItemIndexForType(ash::TYPE_BROWSER_SHORTCUT, *model_);
   EXPECT_TRUE(browser_index >= 0);
   EXPECT_EQ(1u, chrome::GetTotalBrowserCount());
 
@@ -1176,7 +1177,8 @@ IN_PROC_BROWSER_TEST_F(LauncherAppBrowserTest, RefocusFilterLaunch) {
 IN_PROC_BROWSER_TEST_F(LauncherAppBrowserTest, ActivationStateCheck) {
   TabStripModel* tab_strip = browser()->tab_strip_model();
   // Get the browser item index
-  int browser_index = ash::GetBrowserItemIndex(*controller_->model());
+  int browser_index =
+      ash::GetLauncherItemIndexForType(ash::TYPE_BROWSER_SHORTCUT, *model_);
   EXPECT_TRUE(browser_index >= 0);
 
   // Even though we are just comming up, the browser should be active.
@@ -1838,7 +1840,8 @@ IN_PROC_BROWSER_TEST_F(LauncherAppBrowserTest, MatchingLauncherIDandActiveTab) {
 
   aura::Window* window = browser()->window()->GetNativeWindow();
 
-  int browser_index = ash::GetBrowserItemIndex(*model_);
+  int browser_index =
+      ash::GetLauncherItemIndexForType(ash::TYPE_BROWSER_SHORTCUT, *model_);
   ash::LauncherID browser_id = model_->items()[browser_index].id;
   EXPECT_EQ(browser_id, controller_->GetIDByWindow(window));