okashii

chrome/browser/ui/views/ash/launcher/launcher_updater_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 "chrome/browser/ui/views/ash/launcher/launcher_updater.h"
 
 #include <map>
 #include <string>
 
 #include "ash/launcher/launcher_model.h"
@@ skipping 80 matching lines @@
 
   virtual void SetUp() OVERRIDE {
     ChromeRenderViewHostTestHarness::SetUp();
 
     activation_client_.reset(
         new aura::test::TestActivationClient(root_window()));
     launcher_model_.reset(new ash::LauncherModel);
     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:
   // Contains all the objects needed to create a LauncherUpdater.
   struct State : public aura::client::ActivationDelegate {
    public:
     State(LauncherUpdaterTest* test,
           const std::string& app_id,
           LauncherUpdater::Type launcher_type)
         : launcher_test(test),
@@ skipping 41 matching lines @@
 
   LauncherUpdater* GetUpdaterByID(ash::LauncherID id) const {
     return launcher_delegate_->id_to_item_map_[id].updater;
   }
 
   const std::string& GetAppID(ash::LauncherID id) const {
     return launcher_delegate_->id_to_item_map_[id].app_id;
   }
 
   void ResetAppIconLoader() {
-    launcher_delegate_->SetAppIconLoaderForTest(app_icon_loader_);
+    launcher_delegate_->SetAppIconLoader(app_icon_loader_);
   }
 
   void UnpinAppsWithID(const std::string& app_id) {
     launcher_delegate_->UnpinAppsWithID(app_id);
   }
 
   ash::LauncherItem GetItem(LauncherUpdater& updater,
                             TabContentsWrapper* tab) {
     LauncherUpdater::TestApi test_api(&updater);
     ash::LauncherID launcher_id = test_api.GetLauncherID(tab);
@@ skipping 502 matching lines @@
 
   launcher_delegate_.reset(NULL);
   ASSERT_EQ(initial_size, launcher_model_->items().size());
 
   launcher_delegate_.reset(
       new ChromeLauncherDelegate(profile(), launcher_model_.get()));
   app_icon_loader_ = new AppIconLoaderImpl;
   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;
   EXPECT_EQ("1", GetAppID(id));
   EXPECT_EQ(ChromeLauncherDelegate::APP_TYPE_TAB,
             launcher_delegate_->GetAppType(id));
   EXPECT_TRUE(launcher_delegate_->IsPinned(id));
   EXPECT_EQ(ash::TYPE_APP, launcher_model_->items()[initial_size + 1].type);
   ash::LauncherID id2 = launcher_model_->items()[initial_size + 1].id;
   EXPECT_EQ("2", GetAppID(id2));
@@ skipping 144 matching lines @@
   EXPECT_EQ(&state1.window, activation_client_->GetActiveWindow());
 
   // And to the second item active.
   ash::LauncherItem new_item2(launcher_model_->items()[index2]);
   new_item2.status = ash::STATUS_ACTIVE;
   launcher_model_->Set(index2, new_item2);
   EXPECT_EQ(ash::STATUS_RUNNING, launcher_model_->items()[index1].status);
   EXPECT_EQ(ash::STATUS_ACTIVE, launcher_model_->items()[index2].status);
   EXPECT_EQ(&state2.window, activation_client_->GetActiveWindow());
 }