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

ash/system/chromeos/screen_security/screen_tray_item.cc

Index: ash/system/chromeos/screen_security/screen_tray_item.cc
diff --git a/ash/system/chromeos/screen_security/screen_tray_item.cc b/ash/system/chromeos/screen_security/screen_tray_item.cc
index e274bdc832f8760b2e06e29502c5bdafbabc483c..45f5d6e01c4346bc4d00119a3d64766f9678e9b9 100644
--- a/ash/system/chromeos/screen_security/screen_tray_item.cc
+++ b/ash/system/chromeos/screen_security/screen_tray_item.cc
@@ -4,7 +4,7 @@
 
 #include "ash/system/chromeos/screen_security/screen_tray_item.h"
 
-#include "ash/common/wm/shelf/wm_shelf_util.h"
+#include "ash/common/shelf/wm_shelf_util.h"
 #include "ash/shelf/shelf_util.h"
 #include "ash/system/tray/fixed_sized_image_view.h"
 #include "ash/system/tray/tray_constants.h"
@@ -184,13 +184,12 @@ void ScreenTrayItem::DestroyDefaultView() {
   default_view_ = NULL;
 }
 
-void ScreenTrayItem::UpdateAfterShelfAlignmentChange(
-    wm::ShelfAlignment alignment) {
+void ScreenTrayItem::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) {
   if (!tray_view_)
     return;
 
   // Center the item dependent on the orientation of the shelf.
-  views::BoxLayout::Orientation layout = wm::IsHorizontalAlignment(alignment)
+  views::BoxLayout::Orientation layout = IsHorizontalAlignment(alignment)
                                              ? views::BoxLayout::kHorizontal
                                              : views::BoxLayout::kVertical;
   tray_view_->SetLayoutManager(new views::BoxLayout(layout, 0, 0, 0));