mash: Use mojo for ShelfItemDelegate and [app] MenuItem.

chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.h

Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.h
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.h b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.h
index c36de2bdc6b73074a3bb943a5e4d6bec4b745aa0..25eb6ffdc6c787e51607c1dd889c1d04ca135d01 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.h
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.h
@@ -5,15 +5,11 @@
 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_MUS_H_
 #define CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_MUS_H_
 
-#include <map>
-#include <memory>
 #include <string>
 
 #include "base/macros.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 
-class ChromeShelfItemDelegate;
-
 class ChromeLauncherControllerMus : public ChromeLauncherController {
  public:
   ChromeLauncherControllerMus();
@@ -54,7 +50,7 @@ class ChromeLauncherControllerMus : public ChromeLauncherController {
       bool allow_minimize) override;
   void ActiveUserChanged(const std::string& user_email) override;
   void AdditionalUserAddedToSession(Profile* profile) override;
-  ash::ShelfAppMenuItemList GetAppMenuItemsForTesting(
+  std::vector<ash::mojom::MenuItemPtr> GetAppMenuItemsForTesting(
       const ash::ShelfItem& item) override;
   std::vector<content::WebContents*> GetV1ApplicationsFromAppId(
       const std::string& app_id) override;
@@ -89,9 +85,6 @@ class ChromeLauncherControllerMus : public ChromeLauncherController {
   // Pin the items set in the current profile's preferences.
   void PinAppsFromPrefs();
 
-  std::map<std::string, std::unique_ptr<ChromeShelfItemDelegate>>
-      app_id_to_item_delegate_;
-
   DISALLOW_COPY_AND_ASSIGN(ChromeLauncherControllerMus);
 };