ash: Remove ash::Shelf in favor of ash::WmShelf

ash/shelf/shelf_unittest.cc

 // Copyright 2013 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/common/shelf/shelf.h"
-
 #include <utility>
 
 #include "ash/common/shelf/shelf_button.h"
 #include "ash/common/shelf/shelf_model.h"
 #include "ash/common/shelf/shelf_view.h"
 #include "ash/common/shelf/shelf_widget.h"
+#include "ash/common/shelf/wm_shelf.h"
 #include "ash/test/ash_test_base.h"
-#include "ash/test/shelf_test_api.h"
 #include "ash/test/shelf_view_test_api.h"
 #include "ash/test/test_shelf_item_delegate.h"
-#include "ash/wm/window_util.h"
-#include "ui/aura/window_event_dispatcher.h"
-#include "ui/views/view.h"
-#include "ui/views/widget/widget.h"
-
-#if defined(OS_WIN)
-#include "base/win/windows_version.h"
-#endif
 
 namespace ash {
 
 class ShelfTest : public test::AshTestBase {
  public:
-  ShelfTest() : shelf_(nullptr), shelf_view_(nullptr), shelf_model_(nullptr) {}
+  ShelfTest() : shelf_model_(nullptr) {}
 
   ~ShelfTest() override {}
 
   void SetUp() override {
     test::AshTestBase::SetUp();
 
-    shelf_ = Shelf::ForPrimaryDisplay();
-    ASSERT_TRUE(shelf_);
+    ShelfView* shelf_view = GetPrimaryShelf()->GetShelfViewForTesting();
+    shelf_model_ = shelf_view->model();
 
-    test::ShelfTestAPI test(shelf_);
-    shelf_view_ = test.shelf_view();
-    shelf_model_ = shelf_view_->model();
-
-    test_.reset(new test::ShelfViewTestAPI(shelf_view_));
+    test_.reset(new test::ShelfViewTestAPI(shelf_view));
   }
 
-  Shelf* shelf() { return shelf_; }
-
-  ShelfView* shelf_view() { return shelf_view_; }
-
   ShelfModel* shelf_model() { return shelf_model_; }
 
   test::ShelfViewTestAPI* test_api() { return test_.get(); }
 
  private:
-  Shelf* shelf_;
-  ShelfView* shelf_view_;
   ShelfModel* shelf_model_;
   std::unique_ptr<test::ShelfViewTestAPI> test_;
 
   DISALLOW_COPY_AND_ASSIGN(ShelfTest);
 };
 
 // Confirms that ShelfItem reflects the appropriated state.
 TEST_F(ShelfTest, StatusReflection) {
   // Initially we have the app list.
   int button_count = test_api()->GetButtonCount();
@@ skipping 33 matching lines @@
   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);
 }
 
 TEST_F(ShelfTest, ShowOverflowBubble) {
-  ShelfWidget* shelf_widget = shelf()->shelf_widget();
+  ShelfWidget* shelf_widget = GetPrimaryShelf()->shelf_widget();
   ShelfID first_item_id = shelf_model()->next_id();
 
   // Add platform app button until overflow.
   int items_added = 0;
   while (!test_api()->IsOverflowButtonVisible()) {
     ShelfItem item;
     item.type = TYPE_PLATFORM_APP;
     item.status = STATUS_RUNNING;
     shelf_model()->Add(item);
 
     ++items_added;
     ASSERT_LT(items_added, 10000);
   }
 
   // Shows overflow bubble.
   test_api()->ShowOverflowBubble();
   EXPECT_TRUE(shelf_widget->IsShowingOverflowBubble());
 
   // 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(shelf_widget->IsShowingOverflowBubble());
 }
 
 }  // namespace ash