mash: Convert FocusCycler to wm common types and move to //ash/common

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/focus_cycler.h"
+#include "ash/common/focus_cycler.h"
 
 #include <memory>
 
 #include "ash/common/shell_window_ids.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/shell.h"
-#include "ash/shell_factory.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/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"
@@ skipping 28 matching lines @@
   views::Widget* GetWidget() override { return widget_; };
   const views::Widget* GetWidget() const override { return widget_; }
 
  private:
   views::Widget* widget_;
   std::vector<views::View*> accessible_panes_;
 };
 
 }  // namespace
 
+// TODO(jamescook): Migrate this test to //ash/common after the status area

[msw, 2016/06/16 23:57:44]

nit: cite a bug?

[James Cook, 2016/06/17 03:39:29]

Done.

+// widget moves.
 class FocusCyclerTest : public AshTestBase {
  public:
   FocusCyclerTest() {}
 
   void SetUp() override {
     AshTestBase::SetUp();
 
     focus_cycler_.reset(new FocusCycler());
 
     ASSERT_TRUE(Shelf::ForPrimaryDisplay());
@@ skipping 306 matching lines @@
   // 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());
 
   // Pressing "Escape" while on the status area should
   // deactivate it, and activate the browser window.
-  aura::Window* root = Shell::GetPrimaryRootWindow();
-  ui::test::EventGenerator event_generator(root, root);
+  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.
   focus_cycler()->RotateFocus(FocusCycler::BACKWARD);
   EXPECT_TRUE(shelf_widget()->IsActive());
   event_generator.PressKey(ui::VKEY_ESCAPE, 0);
   EXPECT_TRUE(wm::IsActiveWindow(browser_window));
   EXPECT_EQ(focus_manager->GetFocusedView(), view1);
 }
 
 // Test that when the shelf widget & status area widget are removed, they should
 // also be removed from focus cycler.
 TEST_F(FocusCyclerTest, RemoveWidgetOnDisplayRemoved) {
   // Two displays are added, so two shelf widgets and two status area widgets
   // are added to focus cycler.
   UpdateDisplay("800x800, 500x500");
   // Remove one display. Its shelf widget and status area widget should also be
   // removed from focus cycler.
   UpdateDisplay("800x800");
 
   // Create a single test window.
   std::unique_ptr<Window> window(CreateTestWindowInShellWithId(0));
   wm::ActivateWindow(window.get());
   EXPECT_TRUE(wm::IsActiveWindow(window.get()));
 
   // Cycle focus to the status area.
-  Shell::GetInstance()->focus_cycler()->RotateFocus(FocusCycler::FORWARD);
+  WmShell::Get()->focus_cycler()->RotateFocus(FocusCycler::FORWARD);
   EXPECT_FALSE(wm::IsActiveWindow(window.get()));
 
   // Cycle focus to the shelf.
-  Shell::GetInstance()->focus_cycler()->RotateFocus(FocusCycler::FORWARD);
+  WmShell::Get()->focus_cycler()->RotateFocus(FocusCycler::FORWARD);
 
   // Cycle focus should go back to the browser.
-  Shell::GetInstance()->focus_cycler()->RotateFocus(FocusCycler::FORWARD);
+  WmShell::Get()->focus_cycler()->RotateFocus(FocusCycler::FORWARD);
   EXPECT_TRUE(wm::IsActiveWindow(window.get()));
 }
 
 }  // namespace test
 }  // namespace ash