ash: Fix variable names and setters in ShelfLayoutManager and tests

ash/screen_util_unittest.cc

Index: ash/screen_util_unittest.cc
diff --git a/ash/screen_util_unittest.cc b/ash/screen_util_unittest.cc
index 6adae38a17413d74a8a42bfb8cefa2cbc9704488..2fe76958f9d85133b8106c72f2458722acccef5a 100644
--- a/ash/screen_util_unittest.cc
+++ b/ash/screen_util_unittest.cc
@@ -5,9 +5,6 @@
 #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"
@@ -28,9 +25,6 @@ TEST_F(ScreenUtilTest, Bounds) {
     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();
@@ -38,10 +32,10 @@ TEST_F(ScreenUtilTest, Bounds) {
       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());
@@ -55,9 +49,9 @@ TEST_F(ScreenUtilTest, Bounds) {
                 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());