mash: Fold ShelfItemDelegateManager into ShelfModel

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

 // Copyright 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/chrome_launcher_controller_impl.h"
 
 #include <stddef.h>
 
 #include "ash/common/ash_switches.h"
 #include "ash/common/shelf/app_list_button.h"
@@ skipping 356 matching lines @@
       // This triggers an internal cancel. Using VKEY_ESCAPE was too unreliable.
       button->OnMouseCaptureLost();
     }
     if (command != RIP_OFF_ITEM_AND_DONT_RELEASE_MOUSE) {
       generator->ReleaseLeftButton();
       base::RunLoop().RunUntilIdle();
       test->RunMessageLoopUntilAnimationsDone();
     }
   }
 
-  std::unique_ptr<LauncherContextMenu> CreateLauncherContextMenu(
-      ash::ShelfItemType shelf_item_type) {
-    ash::ShelfItem item;
-    item.id = 1;  // dummy id
-    item.type = shelf_item_type;
+  // Creates a context menu for the existing browser shortcut item.
+  std::unique_ptr<LauncherContextMenu> CreateBrowserItemContextMenu() {
+    int index = model_->GetItemIndexForType(ash::TYPE_BROWSER_SHORTCUT);
+    DCHECK_GE(index, 0);
+    ash::ShelfItem item = model_->items()[index];
     ash::Shelf* shelf = ash::Shelf::ForWindow(CurrentContext());
     std::unique_ptr<LauncherContextMenu> menu(LauncherContextMenu::Create(
         controller_, &item, ash::test::ShelfTestAPI(shelf).wm_shelf()));
     return menu;
   }
 
   aura::Window* CurrentContext() {
     aura::Window* root_window = ash::Shell::GetTargetRootWindow();
     DCHECK(root_window);
     return root_window;
@@ skipping 1996 matching lines @@
   // The apps should now be running, with the last opened app active.
   EXPECT_EQ(ash::STATUS_RUNNING, model_->ItemByID(hosted_app_shelf_id)->status);
   EXPECT_EQ(ash::STATUS_ACTIVE,
             model_->ItemByID(bookmark_app_shelf_id)->status);
 }
 
 // Test that "Close" is shown in the context menu when there are opened browsers
 // windows.
 IN_PROC_BROWSER_TEST_F(ShelfAppBrowserTest,
                        LauncherContextMenuVerifyCloseItemAppearance) {
-  // Open a new window.
-  aura::Window* window1 = browser()->window()->GetNativeWindow();
-  ash::wm::WindowState* window1_state = ash::wm::GetWindowState(window1);
-  window1->Show();
-  window1_state->Activate();
-  std::unique_ptr<LauncherContextMenu> menu1 =
-      CreateLauncherContextMenu(ash::TYPE_BROWSER_SHORTCUT);
+  // Open a context menu for the existing browser window.
+  std::unique_ptr<LauncherContextMenu> menu1 = CreateBrowserItemContextMenu();
   // Check if "Close" is added to in the context menu.
   ASSERT_TRUE(
       IsItemPresentInMenu(menu1.get(), LauncherContextMenu::MENU_CLOSE));
 
-  // Close all windows.
+  // Close all windows via the menu item.
   CloseBrowserWindow(browser(), menu1.get(), LauncherContextMenu::MENU_CLOSE);
   EXPECT_EQ(0u, BrowserList::GetInstance()->size());
 
   // Check if "Close" is removed from the context menu.
-  std::unique_ptr<LauncherContextMenu> menu2 =
-      CreateLauncherContextMenu(ash::TYPE_BROWSER_SHORTCUT);
+  std::unique_ptr<LauncherContextMenu> menu2 = CreateBrowserItemContextMenu();
   ASSERT_FALSE(
       IsItemPresentInMenu(menu2.get(), LauncherContextMenu::MENU_CLOSE));
 }