Revert 233787 "Eliminate Shell::RootWindowList in favor of aura:..."

trunk/src/chrome/browser/ui/window_sizer/window_sizer_ash_uitest.cc

Index: trunk/src/chrome/browser/ui/window_sizer/window_sizer_ash_uitest.cc
===================================================================
--- trunk/src/chrome/browser/ui/window_sizer/window_sizer_ash_uitest.cc	(revision 233812)
+++ trunk/src/chrome/browser/ui/window_sizer/window_sizer_ash_uitest.cc	(working copy)
@@ -43,7 +43,7 @@
   base::MessageLoop::current()->RunUntilIdle();
 }
 
-gfx::Rect GetChromeIconBoundsForRootWindow(aura::Window* root_window) {
+gfx::Rect GetChromeIconBoundsForRootWindow(aura::RootWindow* root_window) {
   ash::Launcher* launcher = ash::Launcher::ForWindow(root_window);
   const ash::internal::ShelfView* shelf_view =
       ash::test::LauncherTestAPI(launcher).shelf_view();
@@ -53,7 +53,7 @@
   return view_model->view_at(1)->GetBoundsInScreen();
 }
 
-void OpenBrowserUsingShelfOnRootWindow(aura::Window* root_window) {
+void OpenBrowserUsingShelfOnRootWindow(aura::RootWindow* root_window) {
   aura::test::EventGenerator generator(root_window);
   gfx::Point center =
       GetChromeIconBoundsForRootWindow(root_window).CenterPoint();
@@ -80,7 +80,7 @@
   // Don't shutdown when closing the last browser window.
   chrome::StartKeepAlive();
 
-  aura::Window::Windows root_windows = ash::Shell::GetAllRootWindows();
+  ash::Shell::RootWindowList root_windows = ash::Shell::GetAllRootWindows();
 
   BrowserList* browser_list =
       BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_ASH);
@@ -150,7 +150,7 @@
   DISALLOW_COPY_AND_ASSIGN(WindowSizerContextMenuTest);
 };
 
-void OpenBrowserUsingContextMenuOnRootWindow(aura::Window* root_window) {
+void OpenBrowserUsingContextMenuOnRootWindow(aura::RootWindow* root_window) {
   gfx::Point chrome_icon =
       GetChromeIconBoundsForRootWindow(root_window).CenterPoint();
   gfx::Point release_point = chrome_icon;
@@ -170,7 +170,7 @@
 
   views::MenuController::TurnOffMenuSelectionHoldForTest();
 
-  aura::Window::Windows root_windows = ash::Shell::GetAllRootWindows();
+  ash::Shell::RootWindowList root_windows = ash::Shell::GetAllRootWindows();
 
   BrowserList* browser_list =
       BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_ASH);