ash: Fix variable names and setters in ShelfLayoutManager and tests

ash/shelf/shelf.h

Index: ash/shelf/shelf.h
diff --git a/ash/shelf/shelf.h b/ash/shelf/shelf.h
index 50c80ba3fbb1b9e0f1a729889fb8c00c6658bdf5..a780fb3a7bb7c271f44c2341335ad666c7bff72f 100644
--- a/ash/shelf/shelf.h
+++ b/ash/shelf/shelf.h
@@ -76,6 +76,10 @@ class ASH_EXPORT Shelf {
     return auto_hide_behavior_;
   }
 
+  ShelfAutoHideState GetAutoHideState() const;
+
+  ShelfVisibilityState GetVisibilityState() const;
+
   // A helper functions that chooses values specific to a shelf alignment.
   template <typename T>
   T SelectValueForShelfAlignment(T bottom, T left, T right) const {