(Merge to M-51) Revise the shelf alignment locking mechanism.

ash/shell.cc

Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index b4972ec0a3a2024221a3e77d605e06c855dc8caa..0eccf0ae44df732452a2f81dd3b78e32c56634cf 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -517,7 +517,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,
@@ -526,7 +526,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) {