ash: Fix variable names and setters in ShelfLayoutManager and tests

ash/system/toast/toast_manager_unittest.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/display/display_manager.h"
 #include "ash/screen_util.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shell.h"
 #include "ash/system/toast/toast_manager.h"
@@ skipping 47 matching lines @@
     return overlay ? overlay->text_ : std::string();
   }
 
   void ClickDismissButton() {
     ToastOverlay* overlay = GetCurrentOverlay();
     if (overlay)
       overlay->ClickDismissButtonForTesting(DummyEvent());
   }
 
   void SetShelfAlignment(wm::ShelfAlignment alignment) {
-    Shelf::ForPrimaryDisplay()->shelf_layout_manager()->SetAlignment(alignment);
+    Shelf::ForPrimaryDisplay()->SetAlignment(alignment);
   }
 
   void SetShelfState(ShelfVisibilityState state) {
     Shelf::ForPrimaryDisplay()->shelf_layout_manager()->SetState(state);
   }
 
   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) {
     std::string id = "TOAST_ID_" + base::UintToString(serial_++);
     manager()->Show(ToastData(id, text, duration));
     return id;
   }
 
   void CancelToast(const std::string& id) { manager()->Cancel(id); }
 
@@ skipping 211 matching lines @@
   EXPECT_EQ("TEXT3", GetCurrentText());
   // Cancel the shown toast.
   CancelToast(id3);
   // Confirm that the shown toast disappears.
   EXPECT_FALSE(GetCurrentOverlay());
   // Confirm that only 1 toast is shown.
   EXPECT_EQ(2, GetToastSerial());
 }
 
 }  // namespace ash