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..0c452fb3e7486c8b4838c6beb008f47cfd675842 100644
--- a/ash/shelf/shelf.h
+++ b/ash/shelf/shelf.h
@@ -76,6 +76,11 @@ class ASH_EXPORT Shelf {
     return auto_hide_behavior_;
   }
 
+  ShelfAutoHideState GetAutoHideState() const;
+
+  // See enum description for details.

[msw, 2016/06/01 17:30:08]

nit: remove comment, or add similar to GetAutoHideState.

[James Cook, 2016/06/01 17:56:04]

Done.

+  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 {