Refactor LauncherItemController and LauncherItemDelegate

ash/launcher/launcher_unittest.cc

Index: ash/launcher/launcher_unittest.cc
diff --git a/ash/launcher/launcher_unittest.cc b/ash/launcher/launcher_unittest.cc
index 688a29ac28bbf422e99a804922b62fa3156a9145..56f846970accc48d39c9074b4b87c8dd73ed5421 100644
--- a/ash/launcher/launcher_unittest.cc
+++ b/ash/launcher/launcher_unittest.cc
@@ -4,13 +4,14 @@
 
 #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"
@@ -29,6 +30,13 @@ 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();
@@ -45,6 +53,8 @@ TEST_F(LauncherTest, StatusReflection) {
   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());
@@ -71,6 +81,8 @@ TEST_F(LauncherTest, checkHoverAfterMenu) {
   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);
@@ -93,12 +105,13 @@ TEST_F(LauncherTest, ShowOverflowBubble) {
 
   // 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);
   }