mash: Break ash system tray dependencies on ash::ShelfWidget

ash/system/tray/tray_details_view_unittest.cc

Index: ash/system/tray/tray_details_view_unittest.cc
diff --git a/ash/system/tray/tray_details_view_unittest.cc b/ash/system/tray/tray_details_view_unittest.cc
index 9735f15767cddf30202dc2f098eb3ac2b1670335..a4e2293153200c4a67a3b1b22c24b3155a2b2c44 100644
--- a/ash/system/tray/tray_details_view_unittest.cc
+++ b/ash/system/tray/tray_details_view_unittest.cc
@@ -9,9 +9,6 @@
 #include "ash/common/system/tray/system_tray_item.h"
 #include "ash/common/system/tray/tray_popup_header_button.h"
 #include "ash/common/system/tray/view_click_listener.h"
-#include "ash/root_window_controller.h"
-#include "ash/shelf/shelf_widget.h"
-#include "ash/shell.h"
 #include "ash/system/status_area_widget.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/test/ash_test_base.h"
@@ -29,13 +26,6 @@ namespace test {
 
 namespace {
 
-SystemTray* GetSystemTray() {
-  return Shell::GetPrimaryRootWindowController()
-      ->shelf_widget()
-      ->status_area_widget()
-      ->system_tray();
-}
-
 class TestDetailsView : public TrayDetailsView,
                         public ViewClickListener,
                         public views::ButtonListener {
@@ -78,7 +68,11 @@ class TestDetailsView : public TrayDetailsView,
 // Trivial item implementation that tracks its views for testing.
 class TestItem : public SystemTrayItem {
  public:
-  TestItem() : SystemTrayItem(GetSystemTray()), tray_view_(NULL) {}
+  TestItem()
+      : SystemTrayItem(AshTestBase::GetPrimarySystemTray()),
+        tray_view_(nullptr),
+        default_view_(nullptr),
+        detailed_view_(nullptr) {}
 
   // Overridden from SystemTrayItem:
   views::View* CreateTrayView(LoginStatus status) override {
@@ -118,7 +112,7 @@ class TrayDetailsViewTest : public AshTestBase {
   ~TrayDetailsViewTest() override {}
 
   HoverHighlightView* CreateAndShowHoverHighlightView() {
-    SystemTray* tray = GetSystemTray();
+    SystemTray* tray = GetPrimarySystemTray();
     TestItem* test_item = new TestItem;
     tray->AddTrayItem(test_item);
     tray->ShowDefaultView(BUBBLE_CREATE_NEW);
@@ -131,7 +125,7 @@ class TrayDetailsViewTest : public AshTestBase {
   }
 
   TrayPopupHeaderButton* CreateAndShowTrayPopupHeaderButton() {
-    SystemTray* tray = GetSystemTray();
+    SystemTray* tray = GetPrimarySystemTray();
     TestItem* test_item = new TestItem;
     tray->AddTrayItem(test_item);
     tray->ShowDefaultView(BUBBLE_CREATE_NEW);
@@ -147,7 +141,7 @@ class TrayDetailsViewTest : public AshTestBase {
 };
 
 TEST_F(TrayDetailsViewTest, TransitionToDefaultViewTest) {
-  SystemTray* tray = GetSystemTray();
+  SystemTray* tray = GetPrimarySystemTray();
   ASSERT_TRUE(tray->GetWidget());
 
   TestItem* test_item_1 = new TestItem;
@@ -200,7 +194,7 @@ TEST_F(TrayDetailsViewTest, HoverHighlightViewTouchFeedback) {
   HoverHighlightView* view = CreateAndShowHoverHighlightView();
   EXPECT_FALSE(view->hover());
 
-  ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
+  ui::test::EventGenerator& generator = GetEventGenerator();

[msw, 2016/06/17 19:58:37]

Hmm, I thought we discouraged non-const refs, but I guess that's mainly for
input parameters. Still, it'd be nice if this function returned a pointer.

[James Cook, 2016/06/17 20:14:32]

Yeah, this is bad, but GetEventGenerator() predates me and is used this way in
150 places. Let me know if you want me to fix it and I'll do it in another CL.

   generator.set_current_location(view->GetBoundsInScreen().CenterPoint());
   generator.PressTouch();
   EXPECT_TRUE(view->hover());
@@ -215,7 +209,7 @@ TEST_F(TrayDetailsViewTest, HoverHighlightViewTouchFeedbackCancellation) {
   EXPECT_FALSE(view->hover());
 
   gfx::Rect view_bounds = view->GetBoundsInScreen();
-  ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
+  ui::test::EventGenerator& generator = GetEventGenerator();
   generator.set_current_location(view_bounds.CenterPoint());
   generator.PressTouch();
   EXPECT_TRUE(view->hover());
@@ -234,7 +228,7 @@ TEST_F(TrayDetailsViewTest, TrayPopupHeaderButtonTouchFeedback) {
   TrayPopupHeaderButton* button = CreateAndShowTrayPopupHeaderButton();
   EXPECT_FALSE(button->background());
 
-  ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
+  ui::test::EventGenerator& generator = GetEventGenerator();
   generator.set_current_location(button->GetBoundsInScreen().CenterPoint());
   generator.PressTouch();
   EXPECT_TRUE(button->background());
@@ -250,7 +244,7 @@ TEST_F(TrayDetailsViewTest, TrayPopupHeaderButtonTouchFeedbackCancellation) {
   EXPECT_FALSE(button->background());
 
   gfx::Rect view_bounds = button->GetBoundsInScreen();
-  ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
+  ui::test::EventGenerator& generator = GetEventGenerator();
   generator.set_current_location(view_bounds.CenterPoint());
   generator.PressTouch();
   EXPECT_TRUE(button->background());
@@ -270,7 +264,7 @@ TEST_F(TrayDetailsViewTest, TrayPopupHeaderButtonMouseHoverFeedback) {
   TrayPopupHeaderButton* button = CreateAndShowTrayPopupHeaderButton();
   EXPECT_FALSE(button->background());
 
-  ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
+  ui::test::EventGenerator& generator = GetEventGenerator();
   gfx::Rect bounds = button->GetBoundsInScreen();
   gfx::Point initial_point(bounds.x() - 1, bounds.y());
   generator.set_current_location(initial_point);