okashii

chrome/browser/ui/views/ash/launcher/launcher_updater_unittest.cc

Index: chrome/browser/ui/views/ash/launcher/launcher_updater_unittest.cc
diff --git a/chrome/browser/ui/views/ash/launcher/launcher_updater_unittest.cc b/chrome/browser/ui/views/ash/launcher/launcher_updater_unittest.cc
index 1e50fd98407517b8bb6b27e1b3f715bbd859fd92..11df704cd79f1c68f15d46f2da0072fc5748878a 100644
--- a/chrome/browser/ui/views/ash/launcher/launcher_updater_unittest.cc
+++ b/chrome/browser/ui/views/ash/launcher/launcher_updater_unittest.cc
@@ -98,8 +98,7 @@ class LauncherUpdaterTest : public ChromeRenderViewHostTestHarness {
     launcher_delegate_.reset(
         new ChromeLauncherDelegate(profile(), launcher_model_.get()));
     app_icon_loader_ = new AppIconLoaderImpl;
-    launcher_delegate_->SetAppIconLoaderForTest(app_icon_loader_);
-    launcher_delegate_->Init();
+    ResetAppIconLoader();
   }
 
  protected:
@@ -161,7 +160,7 @@ class LauncherUpdaterTest : public ChromeRenderViewHostTestHarness {
   }
 
   void ResetAppIconLoader() {
-    launcher_delegate_->SetAppIconLoaderForTest(app_icon_loader_);
+    launcher_delegate_->SetAppIconLoader(app_icon_loader_);
   }
 
   void UnpinAppsWithID(const std::string& app_id) {
@@ -684,7 +683,6 @@ TEST_F(LauncherUpdaterTest, PersistPinned) {
   app_icon_loader_->SetAppID(&tab1, "1");
   app_icon_loader_->SetAppID(NULL, "2");
   ResetAppIconLoader();
-  launcher_delegate_->Init();
   ASSERT_EQ(initial_size + 2, launcher_model_->items().size());
   EXPECT_EQ(ash::TYPE_APP, launcher_model_->items()[initial_size].type);
   ash::LauncherID id = launcher_model_->items()[initial_size].id;