ash: Rename GetLauncherItemIndexForType to GetShelfItemIndexForType().

ash/shell.cc

Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index 02a84db06e854bb4fd01bcdb6861e761e3958be8..c22f4bfbcbabc0b78910bd90b525df31c5f74c46 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -33,7 +33,6 @@
 #include "ash/launcher/launcher_item_delegate.h"
 #include "ash/launcher/launcher_item_delegate_manager.h"
 #include "ash/launcher/launcher_model.h"
-#include "ash/launcher/launcher_model_util.h"
 #include "ash/magnifier/magnification_controller.h"
 #include "ash/magnifier/partial_magnification_controller.h"
 #include "ash/new_window_delegate.h"
@@ -42,6 +41,7 @@
 #include "ash/session_state_delegate.h"
 #include "ash/shelf/app_list_shelf_item_delegate.h"
 #include "ash/shelf/shelf_layout_manager.h"
+#include "ash/shelf/shelf_model_util.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell_delegate.h"
 #include "ash/shell_factory.h"
@@ -498,7 +498,7 @@ LauncherDelegate* Shell::GetLauncherDelegate() {
     // Finding the launcher model's location of the app list and setting its
     // LauncherItemDelegate.
     int app_list_index =
-        ash::GetLauncherItemIndexForType(ash::TYPE_APP_LIST, *launcher_model_);
+        GetShelfItemIndexForType(ash::TYPE_APP_LIST, *launcher_model_);
     DCHECK_GE(app_list_index, 0);
     ash::LauncherID app_list_id = launcher_model_->items()[app_list_index].id;
     DCHECK(app_list_id);