ash: Move alignment and autohide behavior from Shelf to WmShelf

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.h"
 #include "ash/common/shelf/shelf_types.h"
+#include "ash/common/shelf/wm_shelf.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 {
 
@@ skipping 10 matching lines @@
 
   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");
-  Shelf::ForPrimaryDisplay()->SetAlignment(shelf_alignment());
+  GetPrimaryShelf()->SetAlignment(shelf_alignment());
   KeyboardOverlayDelegate delegate(base::ASCIIToUTF16("Title"),
                                    GURL("chrome://keyboardoverlay/"));
   // Showing the dialog creates a widget.
   views::Widget* widget = delegate.Show(NULL);
   EXPECT_TRUE(widget);
 
   // The widget is on the primary root window.
   EXPECT_EQ(Shell::GetPrimaryRootWindow(),
             widget->GetNativeWindow()->GetRootWindow());
 
@@ skipping 10 matching lines @@
 
 // Tests run three times - for all possible values of shelf alignment
 INSTANTIATE_TEST_CASE_P(ShelfAlignmentAny,
                         KeyboardOverlayDelegateTest,
                         testing::Values(SHELF_ALIGNMENT_BOTTOM,
                                         SHELF_ALIGNMENT_LEFT,
                                         SHELF_ALIGNMENT_RIGHT,
                                         SHELF_ALIGNMENT_BOTTOM_LOCKED));
 
 }  // namespace ash