ash: Rename more Launcher classes to Shelf*.

ash/launcher/launcher_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.h"
-#include "ash/launcher/launcher_item_delegate_manager.h"
 #include "ash/shelf/shelf_button.h"
+#include "ash/shelf/shelf_item_delegate_manager.h"
 #include "ash/shelf/shelf_model.h"
 #include "ash/shelf/shelf_view.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/launcher_test_api.h"
 #include "ash/test/shelf_view_test_api.h"
-#include "ash/test/test_launcher_item_delegate.h"
+#include "ash/test/test_shelf_item_delegate.h"
 #include "ash/wm/window_util.h"
 #include "ui/aura/root_window.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/corewm/corewm_switches.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"
@@ skipping 18 matching lines @@
   virtual void SetUp() {
     test::AshTestBase::SetUp();
 
     launcher_ = Launcher::ForPrimaryDisplay();
     ASSERT_TRUE(launcher_);
 
     ash::test::LauncherTestAPI test(launcher_);
     shelf_view_ = test.shelf_view();
     shelf_model_ = shelf_view_->model();
     item_delegate_manager_ =
-        Shell::GetInstance()->launcher_item_delegate_manager();
+        Shell::GetInstance()->shelf_item_delegate_manager();
 
     test_.reset(new ash::test::ShelfViewTestAPI(shelf_view_));
   }
 
   virtual void TearDown() OVERRIDE {
     test::AshTestBase::TearDown();
   }
 
   Launcher* launcher() {
     return launcher_;
   }
 
   ShelfView* shelf_view() {
     return shelf_view_;
   }
 
   ShelfModel* shelf_model() {
     return shelf_model_;
   }
 
-  LauncherItemDelegateManager* item_manager() {
+  ShelfItemDelegateManager* item_manager() {
     return item_delegate_manager_;
   }
 
   ash::test::ShelfViewTestAPI* test_api() {
     return test_.get();
   }
 
  private:
   Launcher* launcher_;
   ShelfView* shelf_view_;
   ShelfModel* shelf_model_;
-  LauncherItemDelegateManager* item_delegate_manager_;
-  scoped_ptr<ash::test::ShelfViewTestAPI> test_;
+  ShelfItemDelegateManager* item_delegate_manager_;
+  scoped_ptr<test::ShelfViewTestAPI> test_;
 
   DISALLOW_COPY_AND_ASSIGN(LauncherTest);
 };
 
 // Confirms that LauncherItem reflects the appropriated state.
 TEST_F(LauncherTest, StatusReflection) {
   // Initially we have the app list.
   int button_count = test_api()->GetButtonCount();
 
   // Add running platform app.
@@ skipping 15 matching lines @@
 TEST_F(LauncherTest, checkHoverAfterMenu) {
   // Initially we have the app list.
   int button_count = test_api()->GetButtonCount();
 
   // Add running platform app.
   LauncherItem item;
   item.type = TYPE_PLATFORM_APP;
   item.status = STATUS_RUNNING;
   int index = shelf_model()->Add(item);
 
-  scoped_ptr<LauncherItemDelegate> delegate(
-      new ash::test::TestLauncherItemDelegate(NULL));
-  item_manager()->SetLauncherItemDelegate(shelf_model()->items()[index].id,
-                                          delegate.Pass());
+  scoped_ptr<ShelfItemDelegate> delegate(
+      new test::TestShelfItemDelegate(NULL));
+  item_manager()->SetShelfItemDelegate(shelf_model()->items()[index].id,
+                                       delegate.Pass());
 
   ASSERT_EQ(++button_count, test_api()->GetButtonCount());
   ShelfButton* button = test_api()->GetButton(index);
   button->AddState(ShelfButton::STATE_HOVERED);
   button->ShowContextMenu(gfx::Point(), ui::MENU_SOURCE_MOUSE);
   EXPECT_FALSE(button->state() & ShelfButton::STATE_HOVERED);
 
   // Remove it.
   shelf_model()->RemoveItemAt(index);
 }
@@ skipping 19 matching lines @@
 
   // Removes the first item in main shelf view.
   shelf_model()->RemoveItemAt(shelf_model()->ItemIndexByID(first_item_id));
 
   // Waits for all transitions to finish and there should be no crash.
   test_api()->RunMessageLoopUntilAnimationsDone();
   EXPECT_FALSE(launcher()->IsShowingOverflowBubble());
 }
 
 }  // namespace ash