Cleanup ash shelf accessor functions.

ash/system/web_notification/ash_popup_alignment_delegate_unittest.cc

 // Copyright 2014 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/system/web_notification/ash_popup_alignment_delegate.h"
 
 #include <utility>
 #include <vector>
 
 #include "ash/display/display_manager.h"
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/screen_util.h"
+#include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_types.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
 #include "base/command_line.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/screen.h"
 #include "ui/keyboard/keyboard_switches.h"
 #include "ui/keyboard/keyboard_util.h"
 #include "ui/message_center/message_center_style.h"
 
 namespace ash {
 
 class AshPopupAlignmentDelegateTest : public test::AshTestBase {
  public:
   AshPopupAlignmentDelegateTest() {}
   ~AshPopupAlignmentDelegateTest() override {}
 
   void SetUp() override {
     base::CommandLine::ForCurrentProcess()->AppendSwitch(
         keyboard::switches::kEnableVirtualKeyboard);
     test::AshTestBase::SetUp();
     SetAlignmentDelegate(make_scoped_ptr(new AshPopupAlignmentDelegate(
-        ShelfLayoutManager::ForShelf(Shell::GetPrimaryRootWindow()))));
+        Shelf::ForPrimaryDisplay()->shelf_layout_manager())));
   }
 
   void TearDown() override {
     alignment_delegate_.reset();
     test::AshTestBase::TearDown();
   }
 
   void SetKeyboardBounds(const gfx::Rect& new_bounds) {
-    ShelfLayoutManager::ForShelf(Shell::GetPrimaryRootWindow())
+    Shelf::ForPrimaryDisplay()
+        ->shelf_layout_manager()
         ->OnKeyboardBoundsChanging(new_bounds);
   }
 
  protected:
   enum Position {
     TOP_LEFT,
     TOP_RIGHT,
     BOTTOM_LEFT,
     BOTTOM_RIGHT,
     OUTSIDE
@@ skipping 115 matching lines @@
   const gfx::Rect toast_size(0, 0, 10, 10);
   UpdateDisplay("600x600");
   int origin_x = alignment_delegate()->GetToastOriginX(toast_size);
   int baseline = alignment_delegate()->GetBaseLine();
 
   // Create a window, otherwise autohide doesn't work.
   scoped_ptr<aura::Window> window(CreateTestWindowInShellWithId(0));
   Shell::GetInstance()->SetShelfAutoHideBehavior(
       SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS,
       Shell::GetPrimaryRootWindow());
-  ShelfLayoutManager::ForShelf(Shell::GetPrimaryRootWindow())->
-      UpdateAutoHideStateNow();
+  Shelf::ForPrimaryDisplay()->shelf_layout_manager()->UpdateAutoHideStateNow();
   EXPECT_EQ(origin_x, alignment_delegate()->GetToastOriginX(toast_size));
   EXPECT_LT(baseline, alignment_delegate()->GetBaseLine());
 }
 
 // Verify that docked window doesn't affect the popup alignment.
 TEST_F(AshPopupAlignmentDelegateTest, DockedWindow) {
   const gfx::Rect toast_size(0, 0, 10, 10);
   UpdateDisplay("600x600");
   int origin_x = alignment_delegate()->GetToastOriginX(toast_size);
   int baseline = alignment_delegate()->GetBaseLine();
@@ skipping 80 matching lines @@
   EXPECT_EQ(origin_x, alignment_delegate()->GetToastOriginX(toast_size));
   EXPECT_EQ(baseline - kTrayHeight - message_center::kMarginBetweenItems,
             alignment_delegate()->GetBaseLine());
 }
 
 TEST_F(AshPopupAlignmentDelegateTest, Extended) {
   if (!SupportsMultipleDisplays())
     return;
   UpdateDisplay("600x600,800x800");
   SetAlignmentDelegate(make_scoped_ptr(new AshPopupAlignmentDelegate(
-      ShelfLayoutManager::ForShelf(Shell::GetPrimaryRootWindow()))));
+      Shelf::ForPrimaryDisplay()->shelf_layout_manager())));
 
   gfx::Display second_display = ScreenUtil::GetSecondaryDisplay();
   aura::Window* second_root =
       Shell::GetInstance()
           ->window_tree_host_manager()
           ->GetRootWindowForDisplayId(second_display.id());
   AshPopupAlignmentDelegate for_2nd_display(
-      ShelfLayoutManager::ForShelf(second_root));
+      Shelf::ForWindow(second_root)->shelf_layout_manager());
   UpdateWorkArea(&for_2nd_display, second_display);
   // Make sure that the toast position on the secondary display is
   // positioned correctly.
   EXPECT_LT(1300, for_2nd_display.GetToastOriginX(gfx::Rect(0, 0, 10, 10)));
   EXPECT_LT(700, for_2nd_display.GetBaseLine());
 }
 
 TEST_F(AshPopupAlignmentDelegateTest, Unified) {
   if (!SupportsMultipleDisplays())
     return;
   DisplayManager* display_manager = Shell::GetInstance()->display_manager();
   display_manager->SetUnifiedDesktopEnabled(true);
 
   // Reset the delegate as the primary display's shelf will be destroyed during
   // transition.
   SetAlignmentDelegate(nullptr);
 
   UpdateDisplay("600x600,800x800");
   SetAlignmentDelegate(make_scoped_ptr(new AshPopupAlignmentDelegate(
-      ShelfLayoutManager::ForShelf(Shell::GetPrimaryRootWindow()))));
+      Shelf::ForPrimaryDisplay()->shelf_layout_manager())));
 
   EXPECT_GT(600,
             alignment_delegate()->GetToastOriginX(gfx::Rect(0, 0, 10, 10)));
 }
 
 // Tests that when the keyboard is showing that notifications appear above it,
 // and that they return to normal once the keyboard is gone.
 #if defined(OS_WIN) && !defined(USE_ASH)
 // TODO(msw): Broken on Windows. http://crbug.com/584038
 #define MAYBE_KeyboardShowing DISABLED_KeyboardShowing
@@ skipping 11 matching lines @@
   SetKeyboardBounds(keyboard_bounds);
   int keyboard_baseline = alignment_delegate()->GetBaseLine();
   EXPECT_NE(baseline, keyboard_baseline);
   EXPECT_GT(keyboard_bounds.y(), keyboard_baseline);
 
   SetKeyboardBounds(gfx::Rect());
   EXPECT_EQ(baseline, alignment_delegate()->GetBaseLine());
 }
 
 }  // namespace ash