Revise the shelf alignment locking mechanism.

ash/shell.cc

Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index 55f13e67755c2c751c063f23e6903efc8911a5b6..24397967c956a29b7e284a5825c8d6958494bb46 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -513,7 +513,7 @@ void Shell::SetShelfAutoHideBehavior(ShelfAutoHideBehavior behavior,
 
 ShelfAutoHideBehavior Shell::GetShelfAutoHideBehavior(
     aura::Window* root_window) const {
-  return Shelf::ForWindow(root_window)->GetAutoHideBehavior();
+  return Shelf::ForWindow(root_window)->auto_hide_behavior();
 }
 
 void Shell::SetShelfAlignment(ShelfAlignment alignment,
@@ -522,7 +522,7 @@ void Shell::SetShelfAlignment(ShelfAlignment alignment,
 }
 
 ShelfAlignment Shell::GetShelfAlignment(const aura::Window* root_window) const {
-  return Shelf::ForWindow(root_window)->GetAlignment();
+  return Shelf::ForWindow(root_window)->alignment();
 }
 
 void Shell::OnShelfAlignmentChanged(aura::Window* root_window) {