mash: Cleanup ash shelf application menu code.

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

Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc
index c04792afee2679d52dfb6fa32c2c0deecf18785d..85ca7f537edcdf79ae73887b8911e90b69d83f1f 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc
@@ -47,7 +47,6 @@
 #include "chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.h"
 #include "chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.h"
 #include "chrome/browser/ui/ash/launcher/browser_status_monitor.h"
-#include "chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_browser.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_tab.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_util.h"
@@ -616,12 +615,12 @@ void ChromeLauncherControllerImpl::AdditionalUserAddedToSession(
     controller->AdditionalUserAddedToSession(profile);
 }
 
-ChromeLauncherAppMenuItems ChromeLauncherControllerImpl::GetApplicationList(
+ash::ShelfApplicationMenuItems ChromeLauncherControllerImpl::GetAppMenuItems(
     const ash::ShelfItem& item,
     int event_flags) {
   LauncherItemController* controller = GetLauncherItemController(item.id);
-  return controller ? controller->GetApplicationList(event_flags)
-                    : ChromeLauncherAppMenuItems();
+  return controller ? controller->GetAppMenuItems(event_flags)
+                    : ash::ShelfApplicationMenuItems();
 }
 
 std::vector<content::WebContents*>