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

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/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/root_window_controller.h"
 #include "ash/shelf/shelf.h"
-#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/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"
 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
 #include "ui/events/test/event_generator.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"
 #endif
 
 namespace ash {
 namespace test {
 
 namespace {
 
-SystemTray* GetSystemTray() {
-  return Shell::GetPrimaryRootWindowController()
-      ->shelf_widget()
-      ->status_area_widget()
-      ->system_tray();
-}
-
 // 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),
+        notification_view_(nullptr) {}
 
   views::View* CreateTrayView(LoginStatus status) override {
     tray_view_ = new views::View;
     // Add a label so it has non-zero width.
     tray_view_->SetLayoutManager(new views::FillLayout);
     tray_view_->AddChildView(new views::Label(base::UTF8ToUTF16("Tray")));
     return tray_view_;
   }
 
   views::View* CreateDefaultView(LoginStatus status) override {
@@ skipping 35 matching lines @@
   views::View* tray_view_;
   views::View* default_view_;
   views::View* detailed_view_;
   views::View* notification_view_;
 };
 
 // Trivial item implementation that returns NULL from tray/default/detailed
 // view creation methods.
 class TestNoViewItem : public SystemTrayItem {
  public:
-  TestNoViewItem() : SystemTrayItem(GetSystemTray()) {}
+  TestNoViewItem() : SystemTrayItem(AshTestBase::GetPrimarySystemTray()) {}
 
   views::View* CreateTrayView(LoginStatus status) override { return nullptr; }
 
   views::View* CreateDefaultView(LoginStatus status) override {
     return nullptr;
   }
 
   views::View* CreateDetailedView(LoginStatus status) override {
     return nullptr;
   }
@@ skipping 19 matching lines @@
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ModalWidgetDelegate);
 };
 
 }  // namespace
 
 typedef AshTestBase SystemTrayTest;
 
 TEST_F(SystemTrayTest, SystemTrayDefaultView) {
-  SystemTray* tray = GetSystemTray();
+  SystemTray* tray = GetPrimarySystemTray();
   ASSERT_TRUE(tray->GetWidget());
 
   tray->ShowDefaultView(BUBBLE_CREATE_NEW);
 
   // Ensure that closing the bubble destroys it.
   ASSERT_TRUE(tray->CloseSystemBubble());
   RunAllPendingInMessageLoop();
   ASSERT_FALSE(tray->CloseSystemBubble());
 }
 
 // Opening and closing the bubble should change the coloring of the tray.
 TEST_F(SystemTrayTest, SystemTrayColoring) {
-  SystemTray* tray = GetSystemTray();
+  SystemTray* tray = GetPrimarySystemTray();
   ASSERT_TRUE(tray->GetWidget());
   // 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());
 
   // Closing the system menu should change the coloring back to normal.
   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();
+  SystemTray* tray = GetPrimarySystemTray();
   ASSERT_TRUE(tray->GetWidget());
   Shelf* shelf = Shelf::ForPrimaryDisplay();
   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.
   shelf->SetAlignment(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();
+  SystemTray* tray = GetPrimarySystemTray();
   ASSERT_TRUE(tray->GetWidget());
 
   TestItem* test_item = new TestItem;
   TestItem* detailed_item = new TestItem;
   tray->AddTrayItem(test_item);
   tray->AddTrayItem(detailed_item);
 
   // Check items have been added
   const std::vector<SystemTrayItem*>& items = tray->GetTrayItems();
   ASSERT_TRUE(
@@ skipping 17 matching lines @@
   ASSERT_TRUE(detailed_item->detailed_view() != NULL);
 
   // Show the default view, ensure it's created and the detailed view destroyed.
   tray->ShowDefaultView(BUBBLE_CREATE_NEW);
   RunAllPendingInMessageLoop();
   ASSERT_TRUE(test_item->default_view() != NULL);
   ASSERT_TRUE(detailed_item->detailed_view() == NULL);
 }
 
 TEST_F(SystemTrayTest, SystemTrayNoViewItems) {
-  SystemTray* tray = GetSystemTray();
+  SystemTray* tray = GetPrimarySystemTray();
   ASSERT_TRUE(tray->GetWidget());
 
   // Verify that no crashes occur on items lacking some views.
   TestNoViewItem* no_view_item = new TestNoViewItem;
   tray->AddTrayItem(no_view_item);
   tray->ShowDefaultView(BUBBLE_CREATE_NEW);
   tray->ShowDetailedView(no_view_item, 0, false, BUBBLE_USE_EXISTING);
   RunAllPendingInMessageLoop();
 }
 
 TEST_F(SystemTrayTest, TrayWidgetAutoResizes) {
-  SystemTray* tray = GetSystemTray();
+  SystemTray* tray = GetPrimarySystemTray();
   ASSERT_TRUE(tray->GetWidget());
 
   // Add an initial tray item so that the tray gets laid out correctly.
   TestItem* initial_item = new TestItem;
   tray->AddTrayItem(initial_item);
 
   gfx::Size initial_size = tray->GetWidget()->GetWindowBoundsInScreen().size();
 
   TestItem* new_item = new TestItem;
   tray->AddTrayItem(new_item);
 
   gfx::Size new_size = tray->GetWidget()->GetWindowBoundsInScreen().size();
 
   // Adding the new item should change the size of the tray.
   EXPECT_NE(initial_size.ToString(), new_size.ToString());
 
   // Hiding the tray view of the new item should also change the size of the
   // tray.
   new_item->tray_view()->SetVisible(false);
   EXPECT_EQ(initial_size.ToString(),
             tray->GetWidget()->GetWindowBoundsInScreen().size().ToString());
 
   new_item->tray_view()->SetVisible(true);
   EXPECT_EQ(new_size.ToString(),
             tray->GetWidget()->GetWindowBoundsInScreen().size().ToString());
 }
 
 TEST_F(SystemTrayTest, SystemTrayNotifications) {
-  SystemTray* tray = GetSystemTray();
+  SystemTray* tray = GetPrimarySystemTray();
   ASSERT_TRUE(tray->GetWidget());
 
   TestItem* test_item = new TestItem;
   TestItem* detailed_item = new TestItem;
   tray->AddTrayItem(test_item);
   tray->AddTrayItem(detailed_item);
 
   // Ensure the tray views are created.
   ASSERT_TRUE(test_item->tray_view() != NULL);
   ASSERT_TRUE(detailed_item->tray_view() != NULL);
@@ skipping 14 matching lines @@
   ASSERT_TRUE(test_item->notification_view() != NULL);
 
   // Hide the detailed view, ensure the notification view still exists.
   ASSERT_TRUE(tray->CloseSystemBubble());
   RunAllPendingInMessageLoop();
   ASSERT_TRUE(detailed_item->detailed_view() == NULL);
   ASSERT_TRUE(test_item->notification_view() != NULL);
 }
 
 TEST_F(SystemTrayTest, BubbleCreationTypesTest) {
-  SystemTray* tray = GetSystemTray();
+  SystemTray* tray = GetPrimarySystemTray();
   ASSERT_TRUE(tray->GetWidget());
 
   TestItem* test_item = new TestItem;
   tray->AddTrayItem(test_item);
 
   // Ensure the tray views are created.
   ASSERT_TRUE(test_item->tray_view() != NULL);
 
   // Show the default view, ensure the notification view is destroyed.
   tray->ShowDefaultView(BUBBLE_CREATE_NEW);
@@ skipping 16 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 is laid out properly and is fully contained within
 // the shelf.
 TEST_F(SystemTrayTest, TrayBoundsInWidget) {
   Shelf* shelf = Shelf::ForPrimaryDisplay();
-  StatusAreaWidget* widget = Shell::GetPrimaryRootWindowController()
-                                 ->shelf_widget()
-                                 ->status_area_widget();
-  SystemTray* tray = widget->system_tray();
+  StatusAreaWidget* widget = StatusAreaWidgetTestHelper::GetStatusAreaWidget();

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

aside: This test is confusing... partly because of my weak terminology expertise
between the SystemTray and StatusAreaWidget... but maybe refactoring this with
Rect::Contains or EXPECT_GE, etc. would be nice (but not important here/now)

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

Converted to Rect::Contains() and clarified the test comment slightly.

+  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.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());
 
@@ skipping 19 matching lines @@
   shelf->SetAlignment(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();
+  SystemTray* tray = GetPrimarySystemTray();
   ASSERT_TRUE(tray->GetWidget());
 
   TestItem* test_item = new TestItem;
   tray->AddTrayItem(test_item);
 
   std::unique_ptr<aura::Window> window(CreateTestWindowInShellWithId(0));
 
   // Tests for usual default view.
   // Activating window.
   tray->ShowDefaultView(BUBBLE_CREATE_NEW);
@@ skipping 36 matching lines @@
   // Check if the accessibility item is created even with system modal
   // dialog.
   Shell::GetInstance()->accessibility_delegate()->SetVirtualKeyboardEnabled(
       true);
   views::Widget* widget = views::Widget::CreateWindowWithContextAndBounds(
       new ModalWidgetDelegate(),
       Shell::GetPrimaryRootWindow(),
       gfx::Rect(0, 0, 100, 100));
   widget->Show();
 
-  SystemTray* tray = GetSystemTray();
+  SystemTray* tray = GetPrimarySystemTray();
   tray->ShowDefaultView(BUBBLE_CREATE_NEW);
 
   ASSERT_TRUE(tray->HasSystemBubble());
   const views::View* accessibility =
       tray->GetSystemBubble()->bubble_view()->GetViewByID(
           test::kAccessibilityTrayItemViewId);
   ASSERT_TRUE(accessibility);
   EXPECT_TRUE(accessibility->visible());
   EXPECT_FALSE(tray->GetSystemBubble()->bubble_view()->GetViewByID(
       test::kSettingsTrayItemViewId));
@@ skipping 11 matching lines @@
   const views::View* settings =
       tray->GetSystemBubble()->bubble_view()->GetViewByID(
           test::kSettingsTrayItemViewId);
   ASSERT_TRUE(settings);
   EXPECT_TRUE(settings->visible());
 }
 
 // Tests that if SetVisible(true) is called while animating to hidden that the
 // tray becomes visible, and stops animating to hidden.
 TEST_F(SystemTrayTest, SetVisibleDuringHideAnimation) {
-  SystemTray* tray = GetSystemTray();
+  SystemTray* tray = GetPrimarySystemTray();
   ASSERT_TRUE(tray->visible());
 
   std::unique_ptr<ui::ScopedAnimationDurationScaleMode> animation_duration;
   animation_duration.reset(
       new ui::ScopedAnimationDurationScaleMode(
           ui::ScopedAnimationDurationScaleMode::SLOW_DURATION));
   tray->SetVisible(false);
   EXPECT_TRUE(tray->visible());
   EXPECT_EQ(0.0f, tray->layer()->GetTargetOpacity());
 
   tray->SetVisible(true);
   animation_duration.reset();
   tray->layer()->GetAnimator()->StopAnimating();
   EXPECT_TRUE(tray->visible());
   EXPECT_EQ(1.0f, tray->layer()->GetTargetOpacity());
 }
 
 #if defined(OS_CHROMEOS)
 // Tests that touch on an item in the system bubble triggers it to become
 // active.
 TEST_F(SystemTrayTest, TrayPopupItemContainerTouchFeedback) {
-  SystemTray* tray = GetSystemTray();
+  SystemTray* tray = GetPrimarySystemTray();
   tray->ShowDefaultView(BUBBLE_CREATE_NEW);
 
   TrayPopupItemContainer* view =
       static_cast<TrayPopupItemContainer*>(tray->GetSystemBubble()->
           bubble_view()->child_at(0));
   EXPECT_FALSE(view->active());
 
   ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
   generator.set_current_location(view->GetBoundsInScreen().CenterPoint());
   generator.PressTouch();
   EXPECT_TRUE(view->active());
 
   generator.ReleaseTouch();
   EXPECT_FALSE(view->active());
 }
 
 // Tests that touch events on an item in the system bubble cause it to stop
 // being active.
 TEST_F(SystemTrayTest, TrayPopupItemContainerTouchFeedbackCancellation) {
-  SystemTray* tray = GetSystemTray();
+  SystemTray* tray = GetPrimarySystemTray();
   tray->ShowDefaultView(BUBBLE_CREATE_NEW);
 
   TrayPopupItemContainer* view =
       static_cast<TrayPopupItemContainer*>(tray->GetSystemBubble()->
           bubble_view()->child_at(0));
   EXPECT_FALSE(view->active());
 
   gfx::Rect view_bounds = view->GetBoundsInScreen();
   ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
   generator.set_current_location(view_bounds.CenterPoint());
   generator.PressTouch();
   EXPECT_TRUE(view->active());
 
   gfx::Point move_point(view_bounds.x(), view_bounds.CenterPoint().y());
   generator.MoveTouch(move_point);
   EXPECT_FALSE(view->active());
 
   generator.set_current_location(move_point);
   generator.ReleaseTouch();
   EXPECT_FALSE(view->active());
 }
 
 TEST_F(SystemTrayTest, SystemTrayHeightWithBubble) {
-  StatusAreaWidget* widget = Shell::GetPrimaryRootWindowController()
-                                 ->shelf_widget()
-                                 ->status_area_widget();
-  SystemTray* tray = widget->system_tray();
+  SystemTray* tray = GetPrimarySystemTray();
   WebNotificationTray* notification_tray =
       tray->status_area_widget()->web_notification_tray();
 
   // Ensure the initial system tray height is zero.
   EXPECT_EQ(0, notification_tray->system_tray_height_for_test());
 
   // Show the default view, ensure the system tray height is changed.
   tray->ShowDefaultView(BUBBLE_CREATE_NEW);
   RunAllPendingInMessageLoop();
   EXPECT_LT(0, notification_tray->system_tray_height_for_test());
 
   // 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