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..2b09c1ee4487730818d9036e096e1ea20828a823 100644
--- a/ash/screen_util_unittest.cc
+++ b/ash/screen_util_unittest.cc
@@ -6,7 +6,7 @@
 
 #include "ash/display/display_manager.h"
 #include "ash/root_window_controller.h"
-#include "ash/shelf/shelf_layout_manager.h"
+#include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_widget.h"

[msw, 2016/06/01 00:53:23]

nit: remove if not needed?

[James Cook, 2016/06/01 15:53:06]

Done.

 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
@@ -28,8 +28,8 @@ TEST_F(ScreenUtilTest, Bounds) {
     return;
 
   UpdateDisplay("600x600,500x500");
-  Shell::GetPrimaryRootWindowController()->GetShelfLayoutManager()->
-      SetAutoHideBehavior(ash::SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS);
+  Shell::GetPrimaryRootWindowController()->GetShelf()->SetAutoHideBehavior(

[msw, 2016/06/01 00:53:23]

q: is this even needed for the test?

[msw, 2016/06/01 00:53:24]

nit: Shelf::ForPrimaryDisplay()?

[James Cook, 2016/06/01 15:53:06]

Removed and updated bounds expectations.

+      SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS);
 
   views::Widget* primary = views::Widget::CreateWindowWithContextAndBounds(
       NULL, CurrentContext(), gfx::Rect(10, 10, 100, 100));