ash: Fix variable names and setters in ShelfLayoutManager and tests

ash/system/tray/system_tray_unittest.cc

 // Copyright (c) 2012 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/system/tray/system_tray.h"
 
 #include <vector>
 
 #include "ash/accessibility_delegate.h"
 #include "ash/root_window_controller.h"
 #include "ash/shelf/shelf_layout_manager.h"

[msw, 2016/06/01 00:53:24]

nit: include shelf.h instead?

[James Cook, 2016/06/01 15:53:06]

Done.

 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
 #include "ash/system/status_area_widget.h"
 #include "ash/system/tray/system_tray_bubble.h"
 #include "ash/system/tray/system_tray_item.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_popup_item_container.h"
 #include "ash/system/web_notification/web_notification_tray.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/window_util.h"
@@ skipping 154 matching lines @@
   ASSERT_TRUE(tray->CloseSystemBubble());
   RunAllPendingInMessageLoop();
   ASSERT_FALSE(tray->draw_background_as_active());
 }
 
 // Closing the system bubble through an alignment change should change the
 // system tray coloring back to normal.
 TEST_F(SystemTrayTest, SystemTrayColoringAfterAlignmentChange) {
   SystemTray* tray = GetSystemTray();
   ASSERT_TRUE(tray->GetWidget());
-  ShelfLayoutManager* manager = Shell::GetPrimaryRootWindowController()
-                                    ->shelf_widget()
-                                    ->shelf_layout_manager();
-  manager->SetAlignment(wm::SHELF_ALIGNMENT_BOTTOM);
+  Shelf* shelf = Shelf::ForPrimaryDisplay();
+  shelf->SetAlignment(wm::SHELF_ALIGNMENT_BOTTOM);
   // At the beginning the tray coloring is not active.
   ASSERT_FALSE(tray->draw_background_as_active());
 
   // Showing the system bubble should show the background as active.
   tray->ShowDefaultView(BUBBLE_CREATE_NEW);
   ASSERT_TRUE(tray->draw_background_as_active());
 
   // Changing the alignment should close the system bubble and change the
   // background color.
-  manager->SetAlignment(wm::SHELF_ALIGNMENT_LEFT);
+  shelf->SetAlignment(wm::SHELF_ALIGNMENT_LEFT);
   ASSERT_FALSE(tray->draw_background_as_active());
   RunAllPendingInMessageLoop();
   // The bubble should already be closed by now.
   ASSERT_FALSE(tray->CloseSystemBubble());
 }
 
 TEST_F(SystemTrayTest, SystemTrayTestItems) {
   SystemTray* tray = GetSystemTray();
   ASSERT_TRUE(tray->GetWidget());
 
@@ skipping 137 matching lines @@
   RunAllPendingInMessageLoop();
 
   EXPECT_EQ(bubble_bounds.ToString(), test_item->default_view()->GetWidget()->
       GetWindowBoundsInScreen().ToString());
   EXPECT_EQ(widget, test_item->default_view()->GetWidget());
 }
 
 // Tests that the tray is laid out properly and is fully contained within
 // the shelf.
 TEST_F(SystemTrayTest, TrayBoundsInWidget) {
-  ShelfLayoutManager* manager = Shell::GetPrimaryRootWindowController()
-                                    ->shelf_widget()
-                                    ->shelf_layout_manager();
+  Shelf* shelf = Shelf::ForPrimaryDisplay();
   StatusAreaWidget* widget = Shell::GetPrimaryRootWindowController()
                                  ->shelf_widget()
                                  ->status_area_widget();
   SystemTray* tray = widget->system_tray();
 
   // Test in bottom alignment.
-  manager->SetAlignment(wm::SHELF_ALIGNMENT_BOTTOM);
+  shelf->SetAlignment(wm::SHELF_ALIGNMENT_BOTTOM);
   gfx::Rect window_bounds = widget->GetWindowBoundsInScreen();
   gfx::Rect tray_bounds = tray->GetBoundsInScreen();
   EXPECT_TRUE(window_bounds.bottom() >= tray_bounds.bottom());
   EXPECT_TRUE(window_bounds.right() >= tray_bounds.right());
   EXPECT_TRUE(window_bounds.x() >= tray_bounds.x());
   EXPECT_TRUE(window_bounds.y() >= tray_bounds.y());
 
   // Test in locked alignment.
-  manager->SetAlignment(wm::SHELF_ALIGNMENT_BOTTOM_LOCKED);
+  shelf->SetAlignment(wm::SHELF_ALIGNMENT_BOTTOM_LOCKED);
   window_bounds = widget->GetWindowBoundsInScreen();
   tray_bounds = tray->GetBoundsInScreen();
   EXPECT_TRUE(window_bounds.bottom() >= tray_bounds.bottom());
   EXPECT_TRUE(window_bounds.right() >= tray_bounds.right());
   EXPECT_TRUE(window_bounds.x() >= tray_bounds.x());
   EXPECT_TRUE(window_bounds.y() >= tray_bounds.y());
 
   // Test in the left alignment.
-  manager->SetAlignment(wm::SHELF_ALIGNMENT_LEFT);
+  shelf->SetAlignment(wm::SHELF_ALIGNMENT_LEFT);
   window_bounds = widget->GetWindowBoundsInScreen();
   tray_bounds = tray->GetBoundsInScreen();
   EXPECT_TRUE(window_bounds.bottom() >= tray_bounds.bottom());
   EXPECT_TRUE(window_bounds.right() >= tray_bounds.right());
   EXPECT_TRUE(window_bounds.x() >= tray_bounds.x());
   EXPECT_TRUE(window_bounds.y() >= tray_bounds.y());
 
   // Test in the right alignment.
-  manager->SetAlignment(wm::SHELF_ALIGNMENT_LEFT);
+  shelf->SetAlignment(wm::SHELF_ALIGNMENT_LEFT);
   window_bounds = widget->GetWindowBoundsInScreen();
   tray_bounds = tray->GetBoundsInScreen();
   EXPECT_TRUE(window_bounds.bottom() >= tray_bounds.bottom());
   EXPECT_TRUE(window_bounds.right() >= tray_bounds.right());
   EXPECT_TRUE(window_bounds.x() >= tray_bounds.x());
   EXPECT_TRUE(window_bounds.y() >= tray_bounds.y());
 }
 
 TEST_F(SystemTrayTest, PersistentBubble) {
   SystemTray* tray = GetSystemTray();
@@ skipping 169 matching lines @@
   // Hide the default view, ensure the system tray height is back to zero.
   ASSERT_TRUE(tray->CloseSystemBubble());
   RunAllPendingInMessageLoop();
 
   EXPECT_EQ(0, notification_tray->system_tray_height_for_test());
 }
 #endif  // OS_CHROMEOS
 
 }  // namespace test
 }  // namespace ash