mash: Convert shelf to wm::WmWindow types, part 1

ash/focus_cycler_unittest.cc

Index: ash/focus_cycler_unittest.cc
diff --git a/ash/focus_cycler_unittest.cc b/ash/focus_cycler_unittest.cc
index b9842e53976585901952e1bfd2aec5369cd1da2e..03923b1e61dcac45fa7b11e41cb6a2972c703df5 100644
--- a/ash/focus_cycler_unittest.cc
+++ b/ash/focus_cycler_unittest.cc
@@ -6,7 +6,6 @@
 
 #include <memory>
 
-#include "ash/root_window_controller.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
@@ -16,6 +15,8 @@
 #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/common/wm_globals.h"
+#include "ash/wm/common/wm_window.h"
 #include "ash/wm/window_util.h"
 #include "ui/aura/test/test_windows.h"
 #include "ui/aura/window.h"
@@ -91,9 +92,10 @@ class FocusCyclerTest : public AshTestBase {
   bool CreateTray() {
     if (tray_)
       return false;
-    aura::Window* parent =
-        Shell::GetPrimaryRootWindowController()->GetContainer(
-            ash::kShellWindowId_StatusContainer);
+    wm::WmWindow* parent =
+        wm::WmGlobals::Get()
+            ->GetRootWindowForNewWindows()
+            ->GetChildByShellWindowId(kShellWindowId_StatusContainer);
 
     StatusAreaWidget* widget = new StatusAreaWidget(parent, shelf_widget());
     widget->CreateTrayViews();