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

ash/common/shelf/wm_shelf_util.h

Index: ash/common/shelf/wm_shelf_util.h
diff --git a/ash/common/wm/shelf/wm_shelf_util.h b/ash/common/shelf/wm_shelf_util.h
similarity index 61%
rename from ash/common/wm/shelf/wm_shelf_util.h
rename to ash/common/shelf/wm_shelf_util.h
index e8865f342ad70192aca51fb61dc8c6280d351891..acda56a267a091f2c89425e8b97af76957c22c2e 100644
--- a/ash/common/wm/shelf/wm_shelf_util.h
+++ b/ash/common/shelf/wm_shelf_util.h
@@ -2,19 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ASH_COMMON_WM_SHELF_WM_SHELF_UTIL_H_
-#define ASH_COMMON_WM_SHELF_WM_SHELF_UTIL_H_
+#ifndef ASH_COMMON_SHELF_WM_SHELF_UTIL_H_
+#define ASH_COMMON_SHELF_WM_SHELF_UTIL_H_
 
 #include "ash/ash_export.h"
-#include "ash/common/wm/shelf/wm_shelf_types.h"
+#include "ash/common/shelf/shelf_types.h"
 
 namespace ash {
-namespace wm {
 
 // Returns true if the shelf |alignment| is horizontal.
 ASH_EXPORT bool IsHorizontalAlignment(ShelfAlignment alignment);
 
-}  // namespace wm
 }  // namespace ash
 
-#endif  // ASH_COMMON_WM_SHELF_WM_SHELF_UTIL_H_
+#endif  // ASH_COMMON_SHELF_WM_SHELF_UTIL_H_