Revert 226547 "Refactor LauncherItemController and LauncherItemD..."

trunk/src/ash/launcher/launcher_view_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_view.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "ash/ash_switches.h"
 #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"
 #include "ash/root_window_controller.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/launcher_test_api.h"
 #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"
 #include "base/memory/scoped_ptr.h"
 #include "grit/ash_resources.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/test/aura_test_base.h"
 #include "ui/aura/test/event_generator.h"
 #include "ui/aura/window.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 168 matching lines @@
     model_ = test_api.launcher_model();
     Launcher* launcher = Launcher::ForPrimaryDisplay();
     launcher_view_ = test::LauncherTestAPI(launcher).launcher_view();
 
     // The bounds should be big enough for 4 buttons + overflow chevron.
     launcher_view_->SetBounds(0, 0, 500, 50);
 
     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();
-    DCHECK(item_manager_);
-
     // Add browser shortcut launcher item at index 0 for test.
     AddBrowserShortcut();
   }
 
   virtual void TearDown() OVERRIDE {
     test_api_.reset();
     AshTestBase::TearDown();
   }
 
  protected:
-  void CreateAndSetLauncherItemDelegateForID(LauncherID id) {
-    scoped_ptr<LauncherItemDelegate> delegate(
-        new ash::test::TestLauncherItemDelegate(NULL));
-    item_manager_->SetLauncherItemDelegate(id, delegate.Pass());
-  }
-
   LauncherID AddBrowserShortcut() {
     LauncherItem browser_shortcut;
     browser_shortcut.type = TYPE_BROWSER_SHORTCUT;
 
     LauncherID id = model_->next_id();
     model_->AddAt(browser_index_, browser_shortcut);
-    CreateAndSetLauncherItemDelegateForID(id);
     test_api_->RunMessageLoopUntilAnimationsDone();
     return id;
   }
 
   LauncherID AddAppShortcut() {
     LauncherItem item;
     item.type = TYPE_APP_SHORTCUT;
     item.status = STATUS_CLOSED;
 
     LauncherID id = model_->next_id();
     model_->Add(item);
-    CreateAndSetLauncherItemDelegateForID(id);
     test_api_->RunMessageLoopUntilAnimationsDone();
     return id;
   }
 
   LauncherID AddPanel() {
     LauncherID id = AddPanelNoWait();
     test_api_->RunMessageLoopUntilAnimationsDone();
     return id;
   }
 
   LauncherID AddPlatformAppNoWait() {
     LauncherItem item;
     item.type = TYPE_PLATFORM_APP;
     item.status = STATUS_RUNNING;
 
     LauncherID id = model_->next_id();
     model_->Add(item);
-    CreateAndSetLauncherItemDelegateForID(id);
     return id;
   }
 
   LauncherID AddPanelNoWait() {
     LauncherItem item;
     item.type = TYPE_APP_PANEL;
     item.status = STATUS_RUNNING;
 
     LauncherID id = model_->next_id();
     model_->Add(item);
-    CreateAndSetLauncherItemDelegateForID(id);
     return id;
   }
 
   LauncherID AddPlatformApp() {
     LauncherID id = AddPlatformAppNoWait();
     test_api_->RunMessageLoopUntilAnimationsDone();
     return id;
   }
 
   void RemoveByID(LauncherID id) {
@@ skipping 100 matching lines @@
     return launcher_view_->tooltip_manager()->anchor_;
   }
 
   void ShowTooltip() {
     launcher_view_->tooltip_manager()->ShowInternal();
   }
 
   LauncherModel* model_;
   internal::LauncherView* launcher_view_;
   int browser_index_;
-  LauncherItemDelegateManager* item_manager_;
 
   scoped_ptr<LauncherViewTestAPI> test_api_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(LauncherViewTest);
 };
 
 class LauncherViewLegacyShelfLayoutTest : public LauncherViewTest {
  public:
   LauncherViewLegacyShelfLayoutTest() : LauncherViewTest() {
@@ skipping 892 matching lines @@
             test_api_->GetButtonCount());
   gfx::Rect ideal_bounds_0 = test_api_->GetIdealBoundsByIndex(0);
   gfx::Rect ideal_bounds_1 = test_api_->GetIdealBoundsByIndex(1);
   EXPECT_GT(ideal_bounds_0.width(), ideal_bounds_1.width());
 }
 
 INSTANTIATE_TEST_CASE_P(LtrRtl, LauncherViewTextDirectionTest, testing::Bool());
 
 }  // namespace test
 }  // namespace ash