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

ash/system/status_area_widget_delegate.cc

Index: ash/system/status_area_widget_delegate.cc
diff --git a/ash/system/status_area_widget_delegate.cc b/ash/system/status_area_widget_delegate.cc
index d382917197d0e326c53ac151a32febd04a46dfce..703707a2e9cf7d1a288a758ec272e57fd535868c 100644
--- a/ash/system/status_area_widget_delegate.cc
+++ b/ash/system/status_area_widget_delegate.cc
@@ -6,8 +6,8 @@
 
 #include "ash/ash_export.h"
 #include "ash/ash_switches.h"
+#include "ash/common/shelf/wm_shelf_util.h"
 #include "ash/common/shell_window_ids.h"
-#include "ash/common/wm/shelf/wm_shelf_util.h"
 #include "ash/focus_cycler.h"
 #include "ash/shelf/shelf_util.h"
 #include "ash/shell.h"
@@ -50,8 +50,7 @@ class StatusAreaWidgetDelegateAnimationSettings
 namespace ash {
 
 StatusAreaWidgetDelegate::StatusAreaWidgetDelegate()
-    : focus_cycler_for_testing_(nullptr),
-      alignment_(wm::SHELF_ALIGNMENT_BOTTOM) {
+    : focus_cycler_for_testing_(nullptr), alignment_(SHELF_ALIGNMENT_BOTTOM) {
   // Allow the launcher to surrender the focus to another window upon
   // navigation completion by the user.
   set_allow_deactivate_on_esc(true);
@@ -114,7 +113,7 @@ void StatusAreaWidgetDelegate::UpdateLayout() {
   SetLayoutManager(layout);
 
   views::ColumnSet* columns = layout->AddColumnSet(0);
-  if (wm::IsHorizontalAlignment(alignment_)) {
+  if (IsHorizontalAlignment(alignment_)) {
     bool is_first_visible_child = true;
     for (int c = 0; c < child_count(); ++c) {
       views::View* child = child_at(c);