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

trunk/src/ash/autoclick/autoclick_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/autoclick/autoclick_controller.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/test/event_generator.h"
 #include "ui/aura/window.h"
@@ skipping 200 matching lines @@
   events = WaitForMouseEvents();
   EXPECT_EQ(2u, events.size());
   EXPECT_EQ(0, events[0].flags() & ui::EF_CONTROL_DOWN);
   EXPECT_EQ(0, events[0].flags() & ui::EF_SHIFT_DOWN);
   EXPECT_EQ(ui::EF_ALT_DOWN, events[0].flags() & ui::EF_ALT_DOWN);
 }
 
 TEST_F(AutoclickTest, ExtendedDisplay) {
   UpdateDisplay("1280x1024,800x600");
   RunAllPendingInMessageLoop();
-  aura::Window::Windows root_windows = Shell::GetAllRootWindows();
+  Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
   EXPECT_EQ(2u, root_windows.size());
 
   GetAutoclickController()->SetEnabled(true);
   std::vector<ui::MouseEvent> events;
 
   // Test first root window.
   aura::test::EventGenerator generator1(root_windows[0]);
   generator1.MoveMouseTo(100, 200);
   events = WaitForMouseEvents();
   EXPECT_EQ(2u, events.size());
@@ skipping 48 matching lines @@
   // Test scroll events.
   GetEventGenerator().MoveMouseTo(200, 200);
   GetEventGenerator().ScrollSequence(
       gfx::Point(100, 100), base::TimeDelta::FromMilliseconds(200),
       0, 100, 3, 2);
   events = WaitForMouseEvents();
   EXPECT_EQ(0u, events.size());
 }
 
 }  // namespace ash