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

chrome/browser/ui/ash/shelf_browsertest.cc

Index: chrome/browser/ui/ash/shelf_browsertest.cc
diff --git a/chrome/browser/ui/ash/shelf_browsertest.cc b/chrome/browser/ui/ash/shelf_browsertest.cc
index 240eabf37dcd76f3eb191f99620972189666405c..1165d025b24c5cae6ad724d006dc13ef9f0ad2db 100644
--- a/chrome/browser/ui/ash/shelf_browsertest.cc
+++ b/chrome/browser/ui/ash/shelf_browsertest.cc
@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 
 #include "ash/aura/wm_window_aura.h"
-#include "ash/common/shelf/shelf.h"
 #include "ash/common/shelf/shelf_layout_manager.h"
+#include "ash/common/shelf/wm_shelf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
@@ -16,7 +16,7 @@ typedef InProcessBrowserTest ShelfBrowserTest;
 // Confirm that a status bubble doesn't cause the shelf to darken.
 IN_PROC_BROWSER_TEST_F(ShelfBrowserTest, StatusBubble) {
   ash::ShelfLayoutManager* shelf_layout_manager =
-      ash::Shelf::ForWindow(
+      ash::WmShelf::ForWindow(
           ash::WmWindowAura::Get(browser()->window()->GetNativeWindow()))
           ->shelf_layout_manager();
   EXPECT_TRUE(shelf_layout_manager->IsVisible());