chromeos: Rename ash::WmShelf to Shelf

ash/shelf/shelf_widget_unittest.cc

Index: ash/shelf/shelf_widget_unittest.cc
diff --git a/ash/shelf/shelf_widget_unittest.cc b/ash/shelf/shelf_widget_unittest.cc
index 4e3dbc95f28bd44314dad826c19baac6b363f83e..4a7f7e8d6c5481f8e61f4d770a087d57f58d9cd8 100644
--- a/ash/shelf/shelf_widget_unittest.cc
+++ b/ash/shelf/shelf_widget_unittest.cc
@@ -5,10 +5,10 @@
 #include "ash/shelf/shelf_widget.h"
 
 #include "ash/root_window_controller.h"
+#include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_constants.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_view.h"
-#include "ash/shelf/wm_shelf.h"
 #include "ash/shell.h"
 #include "ash/shell_port.h"
 #include "ash/system/status_area_widget.h"
@@ -152,8 +152,8 @@ TEST_F(ShelfWidgetTest, ShelfInitiallySizedAfterLogin) {
 
   // Both displays have a shelf controller.
   aura::Window::Windows roots = Shell::GetAllRootWindows();
-  WmShelf* shelf1 = WmShelf::ForWindow(roots[0]);
-  WmShelf* shelf2 = WmShelf::ForWindow(roots[1]);
+  Shelf* shelf1 = Shelf::ForWindow(roots[0]);
+  Shelf* shelf2 = Shelf::ForWindow(roots[1]);
   ASSERT_TRUE(shelf1);
   ASSERT_TRUE(shelf2);
 
@@ -226,7 +226,7 @@ TEST_F(ShelfWidgetTest, ShelfEdgeOverlappingWindowHitTestMouse) {
   }
 
   // Change shelf alignment to verify that the targeter insets are updated.
-  WmShelf* shelf = GetPrimaryShelf();
+  Shelf* shelf = GetPrimaryShelf();
   shelf->SetAlignment(SHELF_ALIGNMENT_LEFT);
   shelf_layout_manager->LayoutShelf();
   shelf_bounds = shelf_widget->GetWindowBoundsInScreen();
@@ -270,7 +270,7 @@ TEST_F(ShelfWidgetTest, ShelfEdgeOverlappingWindowHitTestMouse) {
 // Tests that the shelf has a slightly larger hit-region for touch-events when
 // it's in the auto-hidden state.
 TEST_F(ShelfWidgetTest, HiddenShelfHitTestTouch) {
-  WmShelf* shelf = GetPrimaryShelf();
+  Shelf* shelf = GetPrimaryShelf();
   ShelfWidget* shelf_widget = GetShelfWidget();
   gfx::Rect shelf_bounds = shelf_widget->GetWindowBoundsInScreen();
   EXPECT_TRUE(!shelf_bounds.IsEmpty());
@@ -336,7 +336,7 @@ class ShelfWidgetAfterLoginTest : public test::AshTestBase {
     SetSessionStarted(true);
 
     // Simulate shelf settings being applied from profile prefs.
-    WmShelf* shelf = GetPrimaryShelf();
+    Shelf* shelf = GetPrimaryShelf();
     ASSERT_NE(nullptr, shelf);
     shelf->SetAlignment(alignment);
     shelf->SetAutoHideBehavior(auto_hide_behavior);
@@ -355,7 +355,7 @@ class ShelfWidgetAfterLoginTest : public test::AshTestBase {
 
 TEST_F(ShelfWidgetAfterLoginTest, InitialValues) {
   // Ensure shelf components are created.
-  WmShelf* shelf = GetPrimaryShelf();
+  Shelf* shelf = GetPrimaryShelf();
   ASSERT_NE(nullptr, shelf);
   ShelfWidget* shelf_widget = GetShelfWidget();
   ASSERT_NE(nullptr, shelf_widget);