Removes WmShelfAura and WmShelfMus

ash/root_window_controller.h

Index: ash/root_window_controller.h
diff --git a/ash/root_window_controller.h b/ash/root_window_controller.h
index 7a61c55ba13ddf278322318db8e5fc8ca489f3bd..c153fbe99d8d52ec412776035e5f06ed6a6c0ce4 100644
--- a/ash/root_window_controller.h
+++ b/ash/root_window_controller.h
@@ -52,7 +52,7 @@ class SystemWallpaperController;
 class TouchHudDebug;
 class TouchHudProjection;
 class WmRootWindowControllerAura;
-class WmShelfAura;
+class WmShelf;
 class WorkspaceController;
 
 #if defined(OS_CHROMEOS)
@@ -97,7 +97,7 @@ class ASH_EXPORT RootWindowController : public ShellObserver {
 
   WorkspaceController* workspace_controller();
 
-  WmShelfAura* wm_shelf_aura() const { return wm_shelf_aura_.get(); }
+  WmShelf* wm_shelf() const { return wm_shelf_.get(); }
 
   WmRootWindowControllerAura* wm_root_window_controller() {
     return wm_root_window_controller_;
@@ -219,7 +219,7 @@ class ASH_EXPORT RootWindowController : public ShellObserver {
   // The shelf controller for this root window. Exists for the entire lifetime
   // of the RootWindowController so that it is safe for observers to be added
   // to it during construction of the shelf widget and status tray.
-  std::unique_ptr<WmShelfAura> wm_shelf_aura_;
+  std::unique_ptr<WmShelf> wm_shelf_;
 
   std::unique_ptr<SystemWallpaperController> system_wallpaper_;