Cleanup ash shelf accessor functions.

ash/shelf/shelf_layout_manager_unittest.cc

 // Copyright (c) 2012 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/shelf/shelf_layout_manager.h"
 
 #include "ash/accelerators/accelerator_controller.h"
 #include "ash/accelerators/accelerator_table.h"
 #include "ash/ash_switches.h"
 #include "ash/display/display_manager.h"
@@ skipping 162 matching lines @@
     if (GetShelfWidget()->GetDimsShelf())
       EXPECT_EQ(GetShelfWidget()->GetWindowBoundsInScreen(),
                 GetShelfWidget()->GetDimmerBoundsForTest());
 
     // The shelf should never be smaller than the hidden state.
     EXPECT_GE(shelf_bounds.height(), not_visible_bounds_.height());
     float scroll_delta = GetShelfLayoutManager()->PrimaryAxisValue(
         scroll_.y(),
         scroll_.x());
     bool increasing_drag =
-        GetShelfLayoutManager()->SelectValueForShelfAlignment(
-            scroll_delta < 0,
-            scroll_delta > 0,
-            scroll_delta < 0,
-            scroll_delta > 0);
+        GetShelfWidget()->shelf()->SelectValueForShelfAlignment(
+            scroll_delta < 0, scroll_delta > 0,
+            scroll_delta < 0, scroll_delta > 0);
     int shelf_size = GetShelfLayoutManager()->PrimaryAxisValue(
         shelf_bounds.height(),
         shelf_bounds.width());
     int visible_bounds_size = GetShelfLayoutManager()->PrimaryAxisValue(
         visible_bounds_.height(),
         visible_bounds_.width());
     int not_visible_bounds_size = GetShelfLayoutManager()->PrimaryAxisValue(
         not_visible_bounds_.height(),
         not_visible_bounds_.width());
     if (was_visible_on_drag_start_) {
@@ skipping 2169 matching lines @@
   StatusAreaWidget* status_area_widget =
       Shell::GetPrimaryRootWindowController()->shelf()->status_area_widget();
   EXPECT_TRUE(status_area_widget->IsVisible());
   // Shelf should be in the first display's area.
   // TODO: make this test more robust against changes in font, font size.
   EXPECT_EQ("353,453 147x47",
             status_area_widget->GetWindowBoundsInScreen().ToString());
 }
 
 }  // namespace ash