Refactor LauncherItemController and LauncherItemDelegate

ash/launcher/launcher_unittest.cc

 // Copyright (c) 2012 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 "ash/launcher/launcher.h"
 #include "ash/launcher/launcher_button.h"
+#include "ash/launcher/launcher_item_delegate_manager.h"
 #include "ash/launcher/launcher_model.h"
 #include "ash/launcher/launcher_view.h"
-
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/launcher_view_test_api.h"
+#include "ash/test/test_launcher_item_delegate.h"
 #include "ash/wm/window_util.h"
 #include "ui/aura/root_window.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/corewm/corewm_switches.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"
 #endif
 
 typedef ash::test::AshTestBase LauncherTest;
 using ash::internal::LauncherView;
 using ash::internal::LauncherButton;
 
 namespace ash {
 
+void RegisterTestLauncherItemDelegateAtIndex(LauncherModel* model, int index) {
+  ash::Shell::GetInstance()->launcher_item_delegate_manager()->
+      RegisterLauncherItemDelegate(
+          model->items()[index].id,
+          new ash::test::TestLauncherItemDelegate(NULL));
+}
+
 // Confirms that LauncherItem reflects the appropriated state.
 TEST_F(LauncherTest, StatusReflection) {
   Launcher* launcher = Launcher::ForPrimaryDisplay();
   ASSERT_TRUE(launcher);
   LauncherView* launcher_view = launcher->GetLauncherViewForTest();
   test::LauncherViewTestAPI test(launcher_view);
   LauncherModel* model = launcher_view->model();
 
   // Initially we have the app list and chrome icon.
   int button_count = test.GetButtonCount();
 
   // Add running platform app.
   LauncherItem item;
   item.type = TYPE_PLATFORM_APP;
   item.status = STATUS_RUNNING;
   int index = model->Add(item);
+  RegisterTestLauncherItemDelegateAtIndex(model, index);
+
   ASSERT_EQ(++button_count, test.GetButtonCount());
   LauncherButton* button = test.GetButton(index);
   EXPECT_EQ(LauncherButton::STATE_RUNNING, button->state());
 
   // Remove it.
   model->RemoveItemAt(index);
   ASSERT_EQ(--button_count, test.GetButtonCount());
 }
 
 // Confirm that using the menu will clear the hover attribute. To avoid another
 // browser test we check this here.
 TEST_F(LauncherTest, checkHoverAfterMenu) {
   Launcher* launcher = Launcher::ForPrimaryDisplay();
   ASSERT_TRUE(launcher);
   LauncherView* launcher_view = launcher->GetLauncherViewForTest();
   test::LauncherViewTestAPI test(launcher_view);
   LauncherModel* model = launcher_view->model();
 
   // Initially we have the app list and chrome icon.
   int button_count = test.GetButtonCount();
 
   // Add running platform app.
   LauncherItem item;
   item.type = TYPE_PLATFORM_APP;
   item.status = STATUS_RUNNING;
   int index = model->Add(item);
+  RegisterTestLauncherItemDelegateAtIndex(model, index);
+
   ASSERT_EQ(++button_count, test.GetButtonCount());
   LauncherButton* button = test.GetButton(index);
   button->AddState(LauncherButton::STATE_HOVERED);
   button->ShowContextMenu(gfx::Point(), ui::MENU_SOURCE_MOUSE);
   EXPECT_FALSE(button->state() & LauncherButton::STATE_HOVERED);
 
   // Remove it.
   model->RemoveItemAt(index);
 }
 
 TEST_F(LauncherTest, ShowOverflowBubble) {
   Launcher* launcher = Launcher::ForPrimaryDisplay();
   ASSERT_TRUE(launcher);
 
   LauncherView* launcher_view = launcher->GetLauncherViewForTest();
   test::LauncherViewTestAPI test(launcher_view);
 
   LauncherModel* model = launcher_view->model();
   LauncherID first_item_id = model->next_id();
 
   // Add platform app button until overflow.
   int items_added = 0;
+  int index = -1;
   while (!test.IsOverflowButtonVisible()) {
     LauncherItem item;
     item.type = TYPE_PLATFORM_APP;
     item.status = STATUS_RUNNING;
-    model->Add(item);
-
+    index = model->Add(item);
+    RegisterTestLauncherItemDelegateAtIndex(model, index);
     ++items_added;
     ASSERT_LT(items_added, 10000);
   }
 
   // Shows overflow bubble.
   test.ShowOverflowBubble();
   EXPECT_TRUE(launcher->IsShowingOverflowBubble());
 
   // Removes the first item in main launcher view.
   model->RemoveItemAt(model->ItemIndexByID(first_item_id));
 
   // Waits for all transitions to finish and there should be no crash.
   test.RunMessageLoopUntilAnimationsDone();
   EXPECT_FALSE(launcher->IsShowingOverflowBubble());
 }
 
 }  // namespace ash