ash: Fix variable names and setters in ShelfLayoutManager and tests

ash/system/toast/toast_manager_unittest.cc

Index: ash/system/toast/toast_manager_unittest.cc
diff --git a/ash/system/toast/toast_manager_unittest.cc b/ash/system/toast/toast_manager_unittest.cc
index 3f2b097389b97574c60d058d2c4baf6dcb0df4b1..d33e68023103aa8cd13fcf28759a376981944320 100644
--- a/ash/system/toast/toast_manager_unittest.cc
+++ b/ash/system/toast/toast_manager_unittest.cc
@@ -65,7 +65,7 @@ class ToastManagerTest : public test::AshTestBase {
   }
 
   void SetShelfAlignment(wm::ShelfAlignment alignment) {
-    Shelf::ForPrimaryDisplay()->shelf_layout_manager()->SetAlignment(alignment);
+    Shelf::ForPrimaryDisplay()->SetAlignment(alignment);
   }
 
   void SetShelfState(ShelfVisibilityState state) {
@@ -73,8 +73,7 @@ class ToastManagerTest : public test::AshTestBase {
   }
 
   void SetShelfAutoHideBehavior(ShelfAutoHideBehavior behavior) {
-    Shelf::ForPrimaryDisplay()->shelf_layout_manager()->SetAutoHideBehavior(
-        behavior);
+    Shelf::ForPrimaryDisplay()->SetAutoHideBehavior(behavior);
   }
 
   std::string ShowToast(const std::string& text, uint64_t duration) {