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

ash/focus_cycler_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/common/focus_cycler.h"
 
 #include <memory>
 
-#include "ash/common/shelf/shelf.h"
 #include "ash/common/shelf/shelf_widget.h"
+#include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/system/status_area_widget.h"
 #include "ash/common/system/status_area_widget_delegate.h"
 #include "ash/common/system/tray/system_tray.h"
 #include "ash/common/wm_shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/status_area_widget_test_helper.h"
 #include "ash/wm/window_util.h"
 #include "ui/aura/test/test_windows.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
@@ skipping 39 matching lines @@
 // TODO(jamescook): Migrate this test to //ash/common after the status area
 // widget moves. http://crbug.com/620955
 class FocusCyclerTest : public AshTestBase {
  public:
   FocusCyclerTest() {}
 
   void SetUp() override {
     AshTestBase::SetUp();
 
     focus_cycler_.reset(new FocusCycler());
-
-    ASSERT_TRUE(Shelf::ForPrimaryDisplay());
   }
 
   void TearDown() override {
     GetStatusAreaWidgetDelegate(GetPrimarySystemTray()->GetWidget())
         ->SetFocusCyclerForTesting(nullptr);
 
     shelf_widget()->SetFocusCycler(nullptr);
 
     focus_cycler_.reset();
 
     AshTestBase::TearDown();
   }
 
  protected:
   // Setup the system tray using StatusAreaWidgetTestHelper and focus_cycler.
   void SetUpTrayFocusCycle() {
     StatusAreaWidget* widget =
         StatusAreaWidgetTestHelper::GetStatusAreaWidget();
     widget->CreateTrayViews();
     widget->Show();
     views::Widget* system_tray_widget = GetPrimarySystemTray()->GetWidget();
     ASSERT_TRUE(system_tray_widget);
     focus_cycler_->AddWidget(system_tray_widget);
     GetStatusAreaWidgetDelegate(system_tray_widget)
         ->SetFocusCyclerForTesting(focus_cycler());
   }
 
   FocusCycler* focus_cycler() { return focus_cycler_.get(); }
 
-  ShelfWidget* shelf_widget() {
-    return Shelf::ForPrimaryDisplay()->shelf_widget();
-  }
+  ShelfWidget* shelf_widget() { return GetPrimaryShelf()->shelf_widget(); }
 
   void InstallFocusCycleOnShelf() {
     // Add the shelf.
     shelf_widget()->SetFocusCycler(focus_cycler());
   }
 
  private:
   std::unique_ptr<FocusCycler> focus_cycler_;
 
   DISALLOW_COPY_AND_ASSIGN(FocusCyclerTest);
@@ skipping 294 matching lines @@
   // Cycle focus to the shelf.
   WmShell::Get()->focus_cycler()->RotateFocus(FocusCycler::FORWARD);
 
   // Cycle focus should go back to the browser.
   WmShell::Get()->focus_cycler()->RotateFocus(FocusCycler::FORWARD);
   EXPECT_TRUE(wm::IsActiveWindow(window.get()));
 }
 
 }  // namespace test
 }  // namespace ash