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

ash/content/keyboard_overlay/keyboard_overlay_delegate_unittest.cc

Index: ash/content/keyboard_overlay/keyboard_overlay_delegate_unittest.cc
diff --git a/ash/content/keyboard_overlay/keyboard_overlay_delegate_unittest.cc b/ash/content/keyboard_overlay/keyboard_overlay_delegate_unittest.cc
index 7db87a6b7dbc65a4228eb672c852a5f6c088e88d..1d481e875d15ec36dba7523567c3d7b3c88ffd91 100644
--- a/ash/content/keyboard_overlay/keyboard_overlay_delegate_unittest.cc
+++ b/ash/content/keyboard_overlay/keyboard_overlay_delegate_unittest.cc
@@ -4,8 +4,8 @@
 
 #include "ash/content/keyboard_overlay/keyboard_overlay_delegate.h"
 
+#include "ash/common/shelf/shelf_types.h"
 #include "ash/shelf/shelf.h"
-#include "ash/shelf/shelf_types.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "base/strings/utf_string_conversions.h"
@@ -18,14 +18,14 @@ namespace ash {
 
 class KeyboardOverlayDelegateTest
     : public test::AshTestBase,
-      public testing::WithParamInterface<wm::ShelfAlignment> {
+      public testing::WithParamInterface<ShelfAlignment> {
  public:
   KeyboardOverlayDelegateTest() : shelf_alignment_(GetParam()) {}
   virtual ~KeyboardOverlayDelegateTest() {}
-  wm::ShelfAlignment shelf_alignment() const { return shelf_alignment_; }
+  ShelfAlignment shelf_alignment() const { return shelf_alignment_; }
 
  private:
-  wm::ShelfAlignment shelf_alignment_;
+  ShelfAlignment shelf_alignment_;
 
   DISALLOW_COPY_AND_ASSIGN(KeyboardOverlayDelegateTest);
 };
@@ -61,9 +61,9 @@ TEST_P(KeyboardOverlayDelegateTest, ShowAndClose) {
 // Tests run three times - for all possible values of shelf alignment
 INSTANTIATE_TEST_CASE_P(ShelfAlignmentAny,
                         KeyboardOverlayDelegateTest,
-                        testing::Values(wm::SHELF_ALIGNMENT_BOTTOM,
-                                        wm::SHELF_ALIGNMENT_LEFT,
-                                        wm::SHELF_ALIGNMENT_RIGHT,
-                                        wm::SHELF_ALIGNMENT_BOTTOM_LOCKED));
+                        testing::Values(SHELF_ALIGNMENT_BOTTOM,
+                                        SHELF_ALIGNMENT_LEFT,
+                                        SHELF_ALIGNMENT_RIGHT,
+                                        SHELF_ALIGNMENT_BOTTOM_LOCKED));
 
 }  // namespace ash