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

ash/content/keyboard_overlay/keyboard_overlay_delegate_unittest.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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"
 #include "ui/aura/window.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 #include "ui/views/widget/widget.h"
 
 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);
 };
 
 // Verifies we can show and close the widget for the overlay dialog.
 TEST_P(KeyboardOverlayDelegateTest, ShowAndClose) {
   if (!SupportsMultipleDisplays())
     return;
 
   UpdateDisplay("500x400,300x200");
@@ skipping 15 matching lines @@
   EXPECT_EQ(work_area.CenterPoint().x(), bounds.CenterPoint().x());
   EXPECT_EQ(work_area.bottom(), bounds.bottom());
 
   // Clean up.
   widget->CloseNow();
 }
 
 // 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