chromeos: Rename ash::WmShelf to Shelf

chrome/browser/chromeos/login/login_browsertest.cc

Index: chrome/browser/chromeos/login/login_browsertest.cc
diff --git a/chrome/browser/chromeos/login/login_browsertest.cc b/chrome/browser/chromeos/login/login_browsertest.cc
index 0ea474b3f57631de19858badb4fba00ebf87aea5..9e028a80ede1c63e220af509d53464ee42c1a94a 100644
--- a/chrome/browser/chromeos/login/login_browsertest.cc
+++ b/chrome/browser/chromeos/login/login_browsertest.cc
@@ -4,7 +4,7 @@
 
 #include <string>
 
-#include "ash/shelf/wm_shelf.h"
+#include "ash/shelf/shelf.h"
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/wm_window.h"
@@ -329,10 +329,10 @@ class ActiveDirectoryLoginTest : public LoginManagerTest {
 void TestSystemTrayIsVisible(bool otr) {
   ash::SystemTray* tray = ash::Shell::Get()->GetPrimarySystemTray();
   aura::Window* primary_win = ash::Shell::GetPrimaryRootWindow();
-  ash::WmShelf* wm_shelf = ash::WmShelf::ForWindow(primary_win);
+  ash::Shelf* shelf = ash::Shelf::ForWindow(primary_win);
   SCOPED_TRACE(testing::Message()
-               << "ShelfVisibilityState=" << wm_shelf->GetVisibilityState()
-               << " ShelfAutoHideBehavior=" << wm_shelf->auto_hide_behavior());
+               << "ShelfVisibilityState=" << shelf->GetVisibilityState()
+               << " ShelfAutoHideBehavior=" << shelf->auto_hide_behavior());
   EXPECT_TRUE(tray->visible());
 
   // This check flakes for LoginGuestTest: https://crbug.com/693106.