mash: Convert all of //ash/system to use WmShelf

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/common/accessibility_delegate.h"
+#include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/system/tray/system_tray_bubble.h"
 #include "ash/common/system/tray/system_tray_item.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/tray_popup_item_container.h"
-#include "ash/shelf/shelf.h"
 #include "ash/shell.h"
 #include "ash/system/status_area_widget.h"
 #include "ash/system/web_notification/web_notification_tray.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/status_area_widget_test_helper.h"
 #include "ash/wm/window_util.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/aura/window.h"
 #include "ui/base/ui_base_types.h"
@@ skipping 146 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 = GetPrimarySystemTray();
   ASSERT_TRUE(tray->GetWidget());
-  Shelf* shelf = Shelf::ForPrimaryDisplay();
+  WmShelf* shelf = GetPrimaryShelf();
   shelf->SetAlignment(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.
@@ skipping 151 matching lines @@
   EXPECT_EQ(bubble_bounds.ToString(), test_item->default_view()
                                           ->GetWidget()
                                           ->GetWindowBoundsInScreen()
                                           .ToString());
   EXPECT_EQ(widget, test_item->default_view()->GetWidget());
 }
 
 // Tests that the tray view is laid out properly and is fully contained within
 // the shelf widget.
 TEST_F(SystemTrayTest, TrayBoundsInWidget) {
-  Shelf* shelf = Shelf::ForPrimaryDisplay();
+  WmShelf* shelf = GetPrimaryShelf();
   StatusAreaWidget* widget = StatusAreaWidgetTestHelper::GetStatusAreaWidget();
   SystemTray* tray = GetPrimarySystemTray();
 
   // Test in bottom alignment.
   shelf->SetAlignment(SHELF_ALIGNMENT_BOTTOM);
   gfx::Rect window_bounds = widget->GetWindowBoundsInScreen();
   gfx::Rect tray_bounds = tray->GetBoundsInScreen();
   EXPECT_TRUE(window_bounds.Contains(tray_bounds));
 
   // Test in locked alignment.
@@ skipping 183 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