Cleanup ash shelf accessor functions.

ash/wm/panels/panel_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/wm/panels/panel_layout_manager.h"
 
 #include "ash/ash_switches.h"
-#include "ash/root_window_controller.h"
 #include "ash/screen_util.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_button.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_model.h"
 #include "ash/shelf/shelf_types.h"
 #include "ash/shelf/shelf_util.h"
 #include "ash/shelf/shelf_view.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
@@ skipping 93 matching lines @@
     gfx::Rect window1_bounds = panel1->GetBoundsInRootWindow();
     gfx::Rect window2_bounds = panel2->GetBoundsInRootWindow();
 
     EXPECT_FALSE(window1_bounds.Intersects(window2_bounds));
   }
 
   void IsPanelAboveLauncherIcon(const aura::Window* panel) {
     // Waits until all shelf view animations are done.
     shelf_view_test()->RunMessageLoopUntilAnimationsDone();
 
-    Shelf* shelf = RootWindowController::ForShelf(panel)->shelf()->shelf();
+    Shelf* shelf = Shelf::ForWindow(panel);
     gfx::Rect icon_bounds = shelf->GetScreenBoundsOfItemIconForWindow(panel);
     ASSERT_FALSE(icon_bounds.width() == 0 && icon_bounds.height() == 0);
 
     gfx::Rect window_bounds = panel->GetBoundsInScreen();
     ASSERT_LT(icon_bounds.width(), window_bounds.width());
     ASSERT_LT(icon_bounds.height(), window_bounds.height());
     gfx::Rect shelf_bounds = shelf->shelf_widget()->GetWindowBoundsInScreen();
     ShelfAlignment alignment = GetAlignment(panel->GetRootWindow());
 
     if (IsHorizontal(alignment)) {
@@ skipping 22 matching lines @@
         EXPECT_EQ(shelf_bounds.bottom(), window_bounds.y());
         break;
     }
   }
 
   void IsCalloutAboveLauncherIcon(aura::Window* panel) {
     // Flush the message loop, since callout updates use a delayed task.
     base::RunLoop().RunUntilIdle();
     views::Widget* widget = GetCalloutWidgetForPanel(panel);
 
-    Shelf* shelf = RootWindowController::ForShelf(panel)->shelf()->shelf();
+    Shelf* shelf = Shelf::ForWindow(panel);
     gfx::Rect icon_bounds = shelf->GetScreenBoundsOfItemIconForWindow(panel);
     ASSERT_FALSE(icon_bounds.IsEmpty());
 
     gfx::Rect panel_bounds = panel->GetBoundsInScreen();
     gfx::Rect callout_bounds = widget->GetWindowBoundsInScreen();
     ASSERT_FALSE(icon_bounds.IsEmpty());
 
     EXPECT_TRUE(widget->IsVisible());
 
     ShelfAlignment alignment = GetAlignment(panel->GetRootWindow());
@@ skipping 54 matching lines @@
     shell->SetShelfAlignment(alignment, root_window);
   }
 
   ShelfAlignment GetAlignment(const aura::Window* root_window) {
     ash::Shell* shell = ash::Shell::GetInstance();
     return shell->GetShelfAlignment(root_window);
   }
 
   void SetShelfAutoHideBehavior(aura::Window* window,
                                 ShelfAutoHideBehavior behavior) {
-    ShelfLayoutManager* shelf = RootWindowController::ForWindow(window)
-                                    ->shelf()
-                                    ->shelf_layout_manager();
-    shelf->SetAutoHideBehavior(behavior);
-    ShelfView* shelf_view = GetShelfView(Shelf::ForWindow(window));
-    test::ShelfViewTestAPI test_api(shelf_view);
+    Shelf* shelf = Shelf::ForWindow(window);
+    shelf->shelf_layout_manager()->SetAutoHideBehavior(behavior);
+    test::ShelfViewTestAPI test_api(GetShelfView(shelf));
     test_api.RunMessageLoopUntilAnimationsDone();
   }
 
   void SetShelfVisibilityState(aura::Window* window,
                                ShelfVisibilityState visibility_state) {
-    ShelfLayoutManager* shelf = RootWindowController::ForWindow(window)
-                                    ->shelf()
-                                    ->shelf_layout_manager();
-    shelf->SetState(visibility_state);
+    Shelf* shelf = Shelf::ForWindow(window);
+    shelf->shelf_layout_manager()->SetState(visibility_state);
   }
 
   ShelfView* GetShelfView(Shelf* shelf) {
     return test::ShelfTestAPI(shelf).shelf_view();
   }
 
  private:
   scoped_ptr<test::ShelfViewTestAPI> shelf_view_test_;
 
   bool IsHorizontal(ShelfAlignment alignment) {
@@ skipping 583 matching lines @@
   // Hit test outside the top edge with a top-aligned shelf.
   touch.set_location(gfx::Point(bounds.x() + 4, bounds.y() - 6));
   target = targeter->FindTargetForEvent(root, &touch);
   EXPECT_NE(w.get(), target);
 }
 
 INSTANTIATE_TEST_CASE_P(LtrRtl, PanelLayoutManagerTextDirectionTest,
                         testing::Bool());
 
 }  // namespace ash