mash: Fold ShelfItemDelegateManager into ShelfModel

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

 // Copyright (c) 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/launcher_context_menu.h"
 
 #include "ash/common/shelf/shelf_item_types.h"
 #include "ash/common/wm_root_window_controller.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
@@ skipping 37 matching lines @@
   ash::WmShelf* GetWmShelf() {
     return ash::WmShell::Get()
         ->GetPrimaryRootWindow()
         ->GetRootWindowController()
         ->GetShelf();
   }
 
   LauncherContextMenu* CreateLauncherContextMenu(
       ash::ShelfItemType shelf_item_type) {
     ash::ShelfItem item;
-    item.id = 1;  // dummy id
+    item.id = 123;  // dummy id
     item.type = shelf_item_type;
     return LauncherContextMenu::Create(controller_.get(), &item, GetWmShelf());
   }
 
   LauncherContextMenu* CreateLauncherContextMenuForDesktopShell() {
     ash::ShelfItem* item = nullptr;
     return LauncherContextMenu::Create(controller_.get(), item, GetWmShelf());
   }
 
   ArcAppTest& arc_test() { return arc_test_; }
@@ skipping 127 matching lines @@
   arc_test().app_instance()->SendTaskCreated(1, arc_test().fake_apps()[0]);
   menu.reset(new ArcLauncherContextMenu(controller(), &item, wm_shelf));
 
   EXPECT_FALSE(
       IsItemPresentInMenu(menu.get(), LauncherContextMenu::MENU_OPEN_NEW));
   EXPECT_TRUE(IsItemPresentInMenu(menu.get(), LauncherContextMenu::MENU_PIN));
   EXPECT_TRUE(menu->IsCommandIdEnabled(LauncherContextMenu::MENU_PIN));
   EXPECT_TRUE(IsItemPresentInMenu(menu.get(), LauncherContextMenu::MENU_CLOSE));
   EXPECT_TRUE(menu->IsCommandIdEnabled(LauncherContextMenu::MENU_CLOSE));
 }