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

trunk/src/ash/wm/immersive_fullscreen_controller_unittest.cc

 // Copyright 2013 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/wm/immersive_fullscreen_controller.h"
 
 #include "ash/display/display_manager.h"
 #include "ash/root_window_controller.h"
 #include "ash/screen_ash.h"
 #include "ash/shelf/shelf_layout_manager.h"
@@ skipping 419 matching lines @@
   // Set up initial state.
   UpdateDisplay("800x600,800x600");
   ash::DisplayLayout display_layout(ash::DisplayLayout::TOP, 0);
   ash::Shell::GetInstance()->display_manager()->SetLayoutForCurrentDisplays(
       display_layout);
 
   controller()->SetEnabled(true);
   ASSERT_TRUE(controller()->IsEnabled());
   ASSERT_FALSE(controller()->IsRevealed());
 
-  aura::Window::Windows root_windows = ash::Shell::GetAllRootWindows();
+  ash::Shell::RootWindowList root_windows = ash::Shell::GetAllRootWindows();
   ASSERT_EQ(root_windows[0],
             top_container()->GetWidget()->GetNativeWindow()->GetRootWindow());
 
   gfx::Rect primary_root_window_bounds_in_screen =
       root_windows[0]->GetBoundsInScreen();
   // Do not set |x| to the root window's x position because the display's
   // corners have special behavior.
   int x = primary_root_window_bounds_in_screen.x() + 10;
   // The y position of the top edge of the primary display.
   int y_top_edge = primary_root_window_bounds_in_screen.y();
@@ skipping 439 matching lines @@
   // Disabling immersive fullscreen maintains the user's auto-hide selection.
   controller()->SetEnabled(false);
   window()->SetProperty(aura::client::kShowStateKey,
                         ui::SHOW_STATE_NORMAL);
   EXPECT_EQ(ash::SHELF_AUTO_HIDE, shelf->visibility_state());
 }
 
 }  // namespase ash
 
 #endif  // defined(OS_CHROMEOS)