mash: Move ash/common/wm/shelf to ash/common/shelf

ash/system/tray/system_tray.h

Index: ash/system/tray/system_tray.h
diff --git a/ash/system/tray/system_tray.h b/ash/system/tray/system_tray.h
index 1e5502a6e778919347eb33963e0b39abcfedd35c..fc85e1bbd010965d0ddc1280176c9581925a2396 100644
--- a/ash/system/tray/system_tray.h
+++ b/ash/system/tray/system_tray.h
@@ -84,7 +84,7 @@ class ASH_EXPORT SystemTray : public TrayBackgroundView,
   void UpdateAfterLoginStatusChange(user::LoginStatus login_status);
 
   // Updates the items when the shelf alignment changes.
-  void UpdateAfterShelfAlignmentChange(wm::ShelfAlignment alignment);
+  void UpdateAfterShelfAlignmentChange(ShelfAlignment alignment);
 
   // Temporarily hides/unhides the notification bubble.
   void SetHideNotifications(bool hidden);
@@ -124,7 +124,7 @@ class ASH_EXPORT SystemTray : public TrayBackgroundView,
   bool CloseNotificationBubbleForTest() const;
 
   // Overridden from TrayBackgroundView.
-  void SetShelfAlignment(wm::ShelfAlignment alignment) override;
+  void SetShelfAlignment(ShelfAlignment alignment) override;
   void AnchorUpdated() override;
   base::string16 GetAccessibleNameForTray() override;
   void BubbleResized(const views::TrayBubbleView* bubble_view) override;