ash: Fix variable names and setters in ShelfLayoutManager and tests

ash/screen_util_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/screen_util.h"
 
 #include "ash/display/display_manager.h"
-#include "ash/root_window_controller.h"
-#include "ash/shelf/shelf_layout_manager.h"
-#include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/display_manager_test_api.h"
 #include "ash/wm/window_util.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
 namespace ash {
 namespace test {
 
 typedef test::AshTestBase ScreenUtilTest;
 
 TEST_F(ScreenUtilTest, Bounds) {
   if (!SupportsMultipleDisplays())
     return;
 
   UpdateDisplay("600x600,500x500");
-  Shell::GetPrimaryRootWindowController()->GetShelfLayoutManager()->
-      SetAutoHideBehavior(ash::SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS);
-
   views::Widget* primary = views::Widget::CreateWindowWithContextAndBounds(
       NULL, CurrentContext(), gfx::Rect(10, 10, 100, 100));
   primary->Show();
   views::Widget* secondary = views::Widget::CreateWindowWithContextAndBounds(
       NULL, CurrentContext(), gfx::Rect(610, 10, 100, 100));
   secondary->Show();
 
-  // Maximized bounds
-  EXPECT_EQ("0,0 600x597",
-            ScreenUtil::GetMaximizedWindowBoundsInParent(
-                primary->GetNativeView()).ToString());
+  // Maximized bounds. By default the shelf is 47px tall (ash::kShelfSize).
+  EXPECT_EQ("0,0 600x553", ScreenUtil::GetMaximizedWindowBoundsInParent(
+                               primary->GetNativeView())
+                               .ToString());
   EXPECT_EQ("0,0 500x453",
             ScreenUtil::GetMaximizedWindowBoundsInParent(
                 secondary->GetNativeView()).ToString());
 
   // Display bounds
   EXPECT_EQ("0,0 600x600",
             ScreenUtil::GetDisplayBoundsInParent(
                 primary->GetNativeView()).ToString());
   EXPECT_EQ("0,0 500x500",
             ScreenUtil::GetDisplayBoundsInParent(
                 secondary->GetNativeView()).ToString());
 
   // Work area bounds
-  EXPECT_EQ("0,0 600x597",
-            ScreenUtil::GetDisplayWorkAreaBoundsInParent(
-                primary->GetNativeView()).ToString());
+  EXPECT_EQ("0,0 600x553", ScreenUtil::GetDisplayWorkAreaBoundsInParent(
+                               primary->GetNativeView())
+                               .ToString());
   EXPECT_EQ("0,0 500x453",
             ScreenUtil::GetDisplayWorkAreaBoundsInParent(
                 secondary->GetNativeView()).ToString());
 }
 
 // Test verifies a stable handling of secondary screen widget changes
 // (crbug.com/226132).
 TEST_F(ScreenUtilTest, StabilityTest) {
   if (!SupportsMultipleDisplays())
     return;
@@ skipping 73 matching lines @@
                 .ToString());
 
   UpdateDisplay("600x500");
   EXPECT_EQ("0,0 600x500",
             ScreenUtil::GetShelfDisplayBoundsInRoot(widget->GetNativeWindow())
                 .ToString());
 }
 
 }  // namespace test
 }  // namespace ash