ash: Fix variable names and setters in ShelfLayoutManager and tests

ash/wm/panels/panel_window_resizer_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/wm/common/panels/panel_window_resizer.h"
 
 #include "ash/root_window_controller.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_model.h"
@@ skipping 250 matching lines @@
   std::unique_ptr<aura::Window> window(CreatePanelWindow(gfx::Point(0, 0)));
   wm::WindowState* state = wm::GetWindowState(window.get());
   gfx::Rect expected_bounds = window->GetBoundsInScreen();
   expected_bounds.set_y(expected_bounds.y() - 100);
   DragStart(window.get());
   DragMove(0, -100);
   EXPECT_FALSE(state->IsMinimized());
 
   // Hide the shelf. This minimizes all attached windows but should ignore
   // the dragged window.
-  ShelfLayoutManager* layout_manager =
-      RootWindowController::ForWindow(window.get())
-          ->shelf_widget()
-          ->shelf_layout_manager();
-  layout_manager->SetAutoHideBehavior(SHELF_AUTO_HIDE_ALWAYS_HIDDEN);
-  layout_manager->UpdateVisibilityState();
+  Shelf* shelf = RootWindowController::ForWindow(window.get())->GetShelf();
+  shelf->SetAutoHideBehavior(SHELF_AUTO_HIDE_ALWAYS_HIDDEN);
+  shelf->shelf_layout_manager()->UpdateVisibilityState();
   RunAllPendingInMessageLoop();
   EXPECT_FALSE(state->IsMinimized());
   EXPECT_EQ(kShellWindowId_PanelContainer, window->parent()->id());
   DragEnd();
 
   // When the drag ends the window should be detached and placed where it was
   // dragged to.
   EXPECT_EQ(kShellWindowId_DefaultContainer, window->parent()->id());
   EXPECT_FALSE(state->IsMinimized());
   EXPECT_EQ(expected_bounds.ToString(), window->GetBoundsInScreen().ToString());
@@ skipping 273 matching lines @@
 
 INSTANTIATE_TEST_CASE_P(LtrRtl, PanelWindowResizerTextDirectionTest,
                         testing::Bool());
 INSTANTIATE_TEST_CASE_P(NormalPanelPopup,
                         PanelWindowResizerTransientTest,
                         testing::Values(ui::wm::WINDOW_TYPE_NORMAL,
                                         ui::wm::WINDOW_TYPE_PANEL,
                                         ui::wm::WINDOW_TYPE_POPUP));
 
 }  // namespace ash