Refactor LauncherItemController and LauncherItemDelegate

ash/launcher/launcher_view_unittest.cc

Index: ash/launcher/launcher_view_unittest.cc
diff --git a/ash/launcher/launcher_view_unittest.cc b/ash/launcher/launcher_view_unittest.cc
index a92f969c10d227fcaa2bf1650a3adc6dd60a50d4..bddad3cd394f28f56caac8403caa2615ced1a878 100644
--- a/ash/launcher/launcher_view_unittest.cc
+++ b/ash/launcher/launcher_view_unittest.cc
@@ -11,6 +11,7 @@
 #include "ash/launcher/launcher.h"
 #include "ash/launcher/launcher_button.h"
 #include "ash/launcher/launcher_icon_observer.h"
+#include "ash/launcher/launcher_item_delegate_manager.h"
 #include "ash/launcher/launcher_model.h"
 #include "ash/launcher/launcher_tooltip_manager.h"
 #include "ash/launcher/launcher_types.h"
@@ -23,6 +24,7 @@
 #include "ash/test/launcher_view_test_api.h"
 #include "ash/test/shell_test_api.h"
 #include "ash/test/test_launcher_delegate.h"
+#include "ash/test/test_launcher_item_delegate.h"
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
@@ -211,6 +213,9 @@ class LauncherViewTest : public AshTestBase {
     test_api_.reset(new LauncherViewTestAPI(launcher_view_));
     test_api_->SetAnimationDuration(1);  // Speeds up animation for test.
 
+    item_manager_ =
+        ash::Shell::GetInstance()->launcher_item_delegate_manager();
+
     // Add browser shortcut launcher item at index 0 for test.
     AddBrowserShortcut();
   }
@@ -227,6 +232,9 @@ class LauncherViewTest : public AshTestBase {
 
     LauncherID id = model_->next_id();
     model_->AddAt(browser_index_, browser_shortcut);
+    item_manager_->RegisterLauncherItemDelegate(
+        id,
+        new ash::test::TestLauncherItemDelegate(NULL));
     test_api_->RunMessageLoopUntilAnimationsDone();
     return id;
   }
@@ -238,6 +246,9 @@ class LauncherViewTest : public AshTestBase {
 
     LauncherID id = model_->next_id();
     model_->Add(item);
+    item_manager_->RegisterLauncherItemDelegate(
+        id,
+        new ash::test::TestLauncherItemDelegate(NULL));
     test_api_->RunMessageLoopUntilAnimationsDone();
     return id;
   }
@@ -255,6 +266,9 @@ class LauncherViewTest : public AshTestBase {
 
     LauncherID id = model_->next_id();
     model_->Add(item);
+    item_manager_->RegisterLauncherItemDelegate(
+        id,
+        new ash::test::TestLauncherItemDelegate(NULL));
     return id;
   }
 
@@ -265,6 +279,9 @@ class LauncherViewTest : public AshTestBase {
 
     LauncherID id = model_->next_id();
     model_->Add(item);
+    item_manager_->RegisterLauncherItemDelegate(
+        id,
+        new ash::test::TestLauncherItemDelegate(NULL));
     return id;
   }
 
@@ -385,6 +402,7 @@ class LauncherViewTest : public AshTestBase {
   LauncherModel* model_;
   internal::LauncherView* launcher_view_;
   int browser_index_;
+  LauncherItemDelegateManager* item_manager_;
 
   scoped_ptr<LauncherViewTestAPI> test_api_;