GetStatusAreaWidget from ash/test in focus_cycler_unittest

ash/focus_cycler_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/common/focus_cycler.h"
 
 #include <memory>
 
 #include "ash/common/shell_window_ids.h"
+#include "ash/common/wm_root_window_controller.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/system/status_area_widget.h"
 #include "ash/system/status_area_widget_delegate.h"
 #include "ash/system/tray/system_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 "ui/aura/test/test_windows.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/events/test/event_generator.h"
 #include "ui/views/accessible_pane_view.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
@@ skipping 22 matching lines @@
               std::back_inserter(*panes));
   }
   views::Widget* GetWidget() override { return widget_; };
   const views::Widget* GetWidget() const override { return widget_; }
 
  private:
   views::Widget* widget_;
   std::vector<views::View*> accessible_panes_;
 };
 
+SystemTray* GetSystemTray() {

[James Cook, 2016/06/24 22:31:42]

Use AshTestBase::GetPrimarySystemTray() instead of adding this method.

[Qiang(Joe) Xu, 2016/06/24 22:56:37]

Done.

+  return StatusAreaWidgetTestHelper::GetStatusAreaWidget()->system_tray();
+}
+
 }  // namespace
 
 // TODO(jamescook): Migrate this test to //ash/common after the status area
 // widget moves. http://crbug.com/620955
 class FocusCyclerTest : public AshTestBase {
  public:
   FocusCyclerTest() {}
 
   void SetUp() override {
     AshTestBase::SetUp();
 
     focus_cycler_.reset(new FocusCycler());
 
     ASSERT_TRUE(Shelf::ForPrimaryDisplay());
   }
 
+  // Setup the system tray using StatusAreaWidgetTestHelper, returning true
+  // on success.
+  bool SetUpTrayFocusCycle() {

[James Cook, 2016/06/24 22:31:42]

Keep this protected.

[Qiang(Joe) Xu, 2016/06/24 22:56:37]

Done.

+    StatusAreaWidget* widget =
+        StatusAreaWidgetTestHelper::GetStatusAreaWidget();
+    widget->CreateTrayViews();
+    widget->Show();
+    if (!GetSystemTray()->GetWidget())

[James Cook, 2016/06/24 22:31:42]

GetWidget() should always return a non-null pointer. If that's important to the
test, you could ASSERT_TRUE() here.

[Qiang(Joe) Xu, 2016/06/24 22:56:37]

Done.

+      return false;
+    focus_cycler_->AddWidget(GetSystemTray()->GetWidget());

[James Cook, 2016/06/24 22:31:42]

nit: cache GetSystemTray()->GetWidget() in a local variable

[Qiang(Joe) Xu, 2016/06/24 22:56:37]

Done.

+    GetStatusAreaWidgetDelegate(GetSystemTray()->GetWidget())
+        ->SetFocusCyclerForTesting(focus_cycler());
+    return true;
+  }
+
   void TearDown() override {
-    if (tray_) {
-      GetStatusAreaWidgetDelegate(tray_->GetWidget())->
-          SetFocusCyclerForTesting(NULL);
-      tray_.reset();
-    }
+    GetStatusAreaWidgetDelegate(GetSystemTray()->GetWidget())
+        ->SetFocusCyclerForTesting(nullptr);
 
-    shelf_widget()->SetFocusCycler(NULL);
+    shelf_widget()->SetFocusCycler(nullptr);

[James Cook, 2016/06/24 22:31:42]

Thanks for fixing these.

 
     focus_cycler_.reset();
 
     AshTestBase::TearDown();
   }
 
  protected:
-  // Creates the system tray, returning true on success.
-  bool CreateTray() {
-    if (tray_)
-      return false;
-    WmWindow* parent =
-        WmShell::Get()->GetRootWindowForNewWindows()->GetChildByShellWindowId(
-            kShellWindowId_StatusContainer);
-
-    StatusAreaWidget* widget = new StatusAreaWidget(parent, GetPrimaryShelf());
-    widget->CreateTrayViews();
-    widget->Show();
-    tray_.reset(widget->system_tray());
-    if (!tray_->GetWidget())
-      return false;
-    focus_cycler_->AddWidget(tray()->GetWidget());
-    GetStatusAreaWidgetDelegate(tray_->GetWidget())->SetFocusCyclerForTesting(
-        focus_cycler());
-    return true;
-  }
-
   FocusCycler* focus_cycler() { return focus_cycler_.get(); }
 
-  SystemTray* tray() { return tray_.get(); }
-
   ShelfWidget* shelf_widget() {
     return Shelf::ForPrimaryDisplay()->shelf_widget();
   }
 
   void InstallFocusCycleOnShelf() {
     // Add the shelf.
     shelf_widget()->SetFocusCycler(focus_cycler());
   }
 
  private:
   std::unique_ptr<FocusCycler> focus_cycler_;
-  std::unique_ptr<SystemTray> tray_;
 
   DISALLOW_COPY_AND_ASSIGN(FocusCyclerTest);
 };
 
 TEST_F(FocusCyclerTest, CycleFocusBrowserOnly) {
   // Create a single test window.
   std::unique_ptr<Window> window0(CreateTestWindowInShellWithId(0));
   wm::ActivateWindow(window0.get());
   EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
 
   // Cycle the window
   focus_cycler()->RotateFocus(FocusCycler::FORWARD);
   EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
 }
 
 TEST_F(FocusCyclerTest, CycleFocusForward) {
-  ASSERT_TRUE(CreateTray());
+  ASSERT_TRUE(SetUpTrayFocusCycle());

[James Cook, 2016/06/24 22:31:42]

with the assert above you won't need all these other asserts

 
   InstallFocusCycleOnShelf();
 
   // Create a single test window.
   std::unique_ptr<Window> window0(CreateTestWindowInShellWithId(0));
   wm::ActivateWindow(window0.get());
   EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
 
   // Cycle focus to the status area.
   focus_cycler()->RotateFocus(FocusCycler::FORWARD);
-  EXPECT_TRUE(tray()->GetWidget()->IsActive());
+  EXPECT_TRUE(GetSystemTray()->GetWidget()->IsActive());
 
   // Cycle focus to the shelf.
   focus_cycler()->RotateFocus(FocusCycler::FORWARD);
   EXPECT_TRUE(shelf_widget()->IsActive());
 
   // Cycle focus to the browser.
   focus_cycler()->RotateFocus(FocusCycler::FORWARD);
   EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
 }
 
 TEST_F(FocusCyclerTest, CycleFocusBackward) {
-  ASSERT_TRUE(CreateTray());
+  ASSERT_TRUE(SetUpTrayFocusCycle());
 
   InstallFocusCycleOnShelf();
 
   // Create a single test window.
   std::unique_ptr<Window> window0(CreateTestWindowInShellWithId(0));
   wm::ActivateWindow(window0.get());
   EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
 
   // Cycle focus to the shelf.
   focus_cycler()->RotateFocus(FocusCycler::BACKWARD);
   EXPECT_TRUE(shelf_widget()->IsActive());
 
   // Cycle focus to the status area.
   focus_cycler()->RotateFocus(FocusCycler::BACKWARD);
-  EXPECT_TRUE(tray()->GetWidget()->IsActive());
+  EXPECT_TRUE(GetSystemTray()->GetWidget()->IsActive());
 
   // Cycle focus to the browser.
   focus_cycler()->RotateFocus(FocusCycler::BACKWARD);
   EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
 }
 
 TEST_F(FocusCyclerTest, CycleFocusForwardBackward) {
-  ASSERT_TRUE(CreateTray());
+  ASSERT_TRUE(SetUpTrayFocusCycle());
 
   InstallFocusCycleOnShelf();
 
   // Create a single test window.
   std::unique_ptr<Window> window0(CreateTestWindowInShellWithId(0));
   wm::ActivateWindow(window0.get());
   EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
 
   // Cycle focus to the shelf.
   focus_cycler()->RotateFocus(FocusCycler::BACKWARD);
   EXPECT_TRUE(shelf_widget()->IsActive());
 
   // Cycle focus to the status area.
   focus_cycler()->RotateFocus(FocusCycler::BACKWARD);
-  EXPECT_TRUE(tray()->GetWidget()->IsActive());
+  EXPECT_TRUE(GetSystemTray()->GetWidget()->IsActive());
 
   // Cycle focus to the browser.
   focus_cycler()->RotateFocus(FocusCycler::BACKWARD);
   EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
 
   // Cycle focus to the status area.
   focus_cycler()->RotateFocus(FocusCycler::FORWARD);
-  EXPECT_TRUE(tray()->GetWidget()->IsActive());
+  EXPECT_TRUE(GetSystemTray()->GetWidget()->IsActive());
 
   // Cycle focus to the shelf.
   focus_cycler()->RotateFocus(FocusCycler::FORWARD);
   EXPECT_TRUE(shelf_widget()->IsActive());
 
   // Cycle focus to the browser.
   focus_cycler()->RotateFocus(FocusCycler::FORWARD);
   EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
 }
 
 TEST_F(FocusCyclerTest, CycleFocusNoBrowser) {
-  ASSERT_TRUE(CreateTray());
+  ASSERT_TRUE(SetUpTrayFocusCycle());
 
   InstallFocusCycleOnShelf();
 
   // Add the shelf and focus it.
   focus_cycler()->FocusWidget(shelf_widget());
 
   // Cycle focus to the status area.
   focus_cycler()->RotateFocus(FocusCycler::FORWARD);
-  EXPECT_TRUE(tray()->GetWidget()->IsActive());
+  EXPECT_TRUE(GetSystemTray()->GetWidget()->IsActive());
 
   // Cycle focus to the shelf.
   focus_cycler()->RotateFocus(FocusCycler::FORWARD);
   EXPECT_TRUE(shelf_widget()->IsActive());
 
   // Cycle focus to the status area.
   focus_cycler()->RotateFocus(FocusCycler::FORWARD);
-  EXPECT_TRUE(tray()->GetWidget()->IsActive());
+  EXPECT_TRUE(GetSystemTray()->GetWidget()->IsActive());
 
   // Cycle focus to the shelf.
   focus_cycler()->RotateFocus(FocusCycler::BACKWARD);
   EXPECT_TRUE(shelf_widget()->IsActive());
 
   // Cycle focus to the status area.
   focus_cycler()->RotateFocus(FocusCycler::BACKWARD);
-  EXPECT_TRUE(tray()->GetWidget()->IsActive());
+  EXPECT_TRUE(GetSystemTray()->GetWidget()->IsActive());
 }
 
 // Tests that focus cycles from the active browser to the status area and back.
 TEST_F(FocusCyclerTest, Shelf_CycleFocusForward) {
-  ASSERT_TRUE(CreateTray());
+  ASSERT_TRUE(SetUpTrayFocusCycle());
   InstallFocusCycleOnShelf();
   shelf_widget()->Hide();
 
   // Create two test windows.
   std::unique_ptr<Window> window0(CreateTestWindowInShellWithId(0));
   std::unique_ptr<Window> window1(CreateTestWindowInShellWithId(1));
   wm::ActivateWindow(window1.get());
   wm::ActivateWindow(window0.get());
   EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
 
   // Cycle focus to the status area.
   focus_cycler()->RotateFocus(FocusCycler::FORWARD);
-  EXPECT_TRUE(tray()->GetWidget()->IsActive());
+  EXPECT_TRUE(GetSystemTray()->GetWidget()->IsActive());
 
   // Cycle focus to the browser.
   focus_cycler()->RotateFocus(FocusCycler::FORWARD);
   EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
 
   // Cycle focus to the status area.
   focus_cycler()->RotateFocus(FocusCycler::FORWARD);
-  EXPECT_TRUE(tray()->GetWidget()->IsActive());
+  EXPECT_TRUE(GetSystemTray()->GetWidget()->IsActive());
 }
 
 TEST_F(FocusCyclerTest, Shelf_CycleFocusBackwardInvisible) {
-  ASSERT_TRUE(CreateTray());
+  ASSERT_TRUE(SetUpTrayFocusCycle());
   InstallFocusCycleOnShelf();
   shelf_widget()->Hide();
 
   // Create a single test window.
   std::unique_ptr<Window> window0(CreateTestWindowInShellWithId(0));
   wm::ActivateWindow(window0.get());
   EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
 
   // Cycle focus to the status area.
   focus_cycler()->RotateFocus(FocusCycler::BACKWARD);
-  EXPECT_TRUE(tray()->GetWidget()->IsActive());
+  EXPECT_TRUE(GetSystemTray()->GetWidget()->IsActive());
 
   // Cycle focus to the browser.
   focus_cycler()->RotateFocus(FocusCycler::BACKWARD);
   EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
 }
 
 TEST_F(FocusCyclerTest, CycleFocusThroughWindowWithPanes) {
-  ASSERT_TRUE(CreateTray());
+  ASSERT_TRUE(SetUpTrayFocusCycle());
 
   InstallFocusCycleOnShelf();
 
   std::unique_ptr<PanedWidgetDelegate> test_widget_delegate;
   std::unique_ptr<views::Widget> browser_widget(new views::Widget);
   test_widget_delegate.reset(new PanedWidgetDelegate(browser_widget.get()));
   views::Widget::InitParams widget_params(
       views::Widget::InitParams::TYPE_WINDOW);
   widget_params.context = CurrentContext();
   widget_params.delegate = test_widget_delegate.get();
@@ skipping 31 matching lines @@
   std::vector<views::View*> panes;
   panes.push_back(pane1);
   panes.push_back(pane2);
 
   test_widget_delegate->SetAccessiblePanes(panes);
 
   views::FocusManager* focus_manager = browser_widget->GetFocusManager();
 
   // Cycle focus to the status area.
   focus_cycler()->RotateFocus(FocusCycler::FORWARD);
-  EXPECT_TRUE(tray()->GetWidget()->IsActive());
+  EXPECT_TRUE(GetSystemTray()->GetWidget()->IsActive());
 
   // Cycle focus to the shelf.
   focus_cycler()->RotateFocus(FocusCycler::FORWARD);
   EXPECT_TRUE(shelf_widget()->IsActive());
 
   // Cycle focus to the first pane in the browser.
   focus_cycler()->RotateFocus(FocusCycler::FORWARD);
   EXPECT_TRUE(wm::IsActiveWindow(browser_window));
   EXPECT_EQ(focus_manager->GetFocusedView(), view1);
 
   // Cycle focus to the second pane in the browser.
   focus_cycler()->RotateFocus(FocusCycler::FORWARD);
   EXPECT_TRUE(wm::IsActiveWindow(browser_window));
   EXPECT_EQ(focus_manager->GetFocusedView(), view3);
 
   // Cycle focus back to the status area.
   focus_cycler()->RotateFocus(FocusCycler::FORWARD);
-  EXPECT_TRUE(tray()->GetWidget()->IsActive());
+  EXPECT_TRUE(GetSystemTray()->GetWidget()->IsActive());
 
   // Reverse direction - back to the second pane in the browser.
   focus_cycler()->RotateFocus(FocusCycler::BACKWARD);
   EXPECT_TRUE(wm::IsActiveWindow(browser_window));
   EXPECT_EQ(focus_manager->GetFocusedView(), view3);
 
   // Back to the first pane in the browser.
   focus_cycler()->RotateFocus(FocusCycler::BACKWARD);
   EXPECT_TRUE(wm::IsActiveWindow(browser_window));
   EXPECT_EQ(focus_manager->GetFocusedView(), view1);
 
   // Back to the shelf.
   focus_cycler()->RotateFocus(FocusCycler::BACKWARD);
   EXPECT_TRUE(shelf_widget()->IsActive());
 
   // Back to the status area.
   focus_cycler()->RotateFocus(FocusCycler::BACKWARD);
-  EXPECT_TRUE(tray()->GetWidget()->IsActive());
+  EXPECT_TRUE(GetSystemTray()->GetWidget()->IsActive());
 
   // Pressing "Escape" while on the status area should
   // deactivate it, and activate the browser window.
   ui::test::EventGenerator& event_generator = GetEventGenerator();
   event_generator.PressKey(ui::VKEY_ESCAPE, 0);
   EXPECT_TRUE(wm::IsActiveWindow(browser_window));
   EXPECT_EQ(focus_manager->GetFocusedView(), view1);
 
   // Similarly, pressing "Escape" while on the shelf.
   // should do the same thing.
@@ skipping 26 matching lines @@
   // Cycle focus to the shelf.
   WmShell::Get()->focus_cycler()->RotateFocus(FocusCycler::FORWARD);
 
   // Cycle focus should go back to the browser.
   WmShell::Get()->focus_cycler()->RotateFocus(FocusCycler::FORWARD);
   EXPECT_TRUE(wm::IsActiveWindow(window.get()));
 }
 
 }  // namespace test
 }  // namespace ash