ash: Fix variable names and setters in ShelfLayoutManager and tests

ash/shelf/shelf.cc

Index: ash/shelf/shelf.cc
diff --git a/ash/shelf/shelf.cc b/ash/shelf/shelf.cc
index 4145b761ce307b2e931117640eacc8a7f49aa92a..90266c1600171d3504d6ac0f8a5d979356c7aac1 100644
--- a/ash/shelf/shelf.cc
+++ b/ash/shelf/shelf.cc
@@ -105,6 +105,14 @@ void Shelf::SetAutoHideBehavior(ShelfAutoHideBehavior auto_hide_behavior) {
       shelf_widget_->GetNativeWindow()->GetRootWindow());
 }
 
+ShelfAutoHideState Shelf::GetAutoHideState() const {
+  return shelf_widget_->shelf_layout_manager()->auto_hide_state();
+}
+
+ShelfVisibilityState Shelf::GetVisibilityState() const {
+  return shelf_widget_->shelf_layout_manager()->visibility_state();
+}
+
 gfx::Rect Shelf::GetScreenBoundsOfItemIconForWindow(
     const aura::Window* window) {
   ShelfID id = GetShelfIDForWindow(window);