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

trunk/src/ash/wm/window_cycle_controller_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/wm/window_cycle_controller.h"
 
 #include <algorithm>
 
 #include "ash/session_state_delegate.h"
 #include "ash/shell.h"
@@ skipping 308 matching lines @@
   controller->HandleCycleWindow(WindowCycleController::FORWARD, true);
   EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
 }
 
 TEST_F(WindowCycleControllerTest, AlwaysOnTopMultipleRootWindows) {
   if (!SupportsMultipleDisplays())
     return;
 
   // Set up a second root window
   UpdateDisplay("1000x600,600x400");
-  aura::Window::Windows root_windows = Shell::GetAllRootWindows();
+  Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
   ASSERT_EQ(2U, root_windows.size());
 
   WindowCycleController* controller =
       Shell::GetInstance()->window_cycle_controller();
 
   Shell::GetInstance()->set_target_root_window(root_windows[0]);
 
   // Create two windows in the primary root.
   scoped_ptr<Window> window0(CreateTestWindowInShellWithId(0));
   EXPECT_EQ(root_windows[0], window0->GetRootWindow());
@@ skipping 97 matching lines @@
   controller->HandleCycleWindow(WindowCycleController::FORWARD, true);
   EXPECT_TRUE(wm::IsActiveWindow(window2.get()));
 
   controller->HandleCycleWindow(WindowCycleController::FORWARD, true);
   EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
 }
 
 }  // namespace
 
 }  // namespace ash