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

trunk/src/ash/drag_drop/drag_drop_tracker_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/drag_drop/drag_drop_tracker.h"
 
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 43 matching lines @@
 
 // TODO(mazda): Remove this once ash/wm/coordinate_conversion.h supports
 // non-X11 platforms.
 #if defined(USE_X11)
 #define MAYBE_GetTarget GetTarget
 #else
 #define MAYBE_GetTarget DISABLED_GetTarget
 #endif
 
 TEST_F(DragDropTrackerTest, MAYBE_GetTarget) {
-  aura::Window::Windows root_windows = Shell::GetAllRootWindows();
+  Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
   EXPECT_EQ(2U, root_windows.size());
 
   scoped_ptr<aura::Window> window0(
       CreateTestWindow(gfx::Rect(0, 0, 100, 100)));
   window0->Show();
 
   scoped_ptr<aura::Window> window1(
       CreateTestWindow(gfx::Rect(300, 100, 100, 100)));
   window1->Show();
   EXPECT_EQ(root_windows[0], window0->GetRootWindow());
@@ skipping 46 matching lines @@
 
 // TODO(mazda): Remove this once ash/wm/coordinate_conversion.h supports
 // non-X11 platforms.
 #if defined(USE_X11)
 #define MAYBE_ConvertEvent ConvertEvent
 #else
 #define MAYBE_ConvertEvent DISABLED_ConvertEvent
 #endif
 
 TEST_F(DragDropTrackerTest, MAYBE_ConvertEvent) {
-  aura::Window::Windows root_windows = Shell::GetAllRootWindows();
+  Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
   EXPECT_EQ(2U, root_windows.size());
 
   scoped_ptr<aura::Window> window0(
       CreateTestWindow(gfx::Rect(0, 0, 100, 100)));
   window0->Show();
 
   scoped_ptr<aura::Window> window1(
       CreateTestWindow(gfx::Rect(300, 100, 100, 100)));
   window1->Show();
 
@@ skipping 51 matching lines @@
   scoped_ptr<ui::LocatedEvent> converted11(ConvertEvent(window1.get(),
                                                            original11));
   EXPECT_EQ(original11.type(), converted11->type());
   EXPECT_EQ("50,50", converted11->location().ToString());
   EXPECT_EQ("150,150", converted11->root_location().ToString());
   EXPECT_EQ(original11.flags(), converted11->flags());
 }
 
 }  // namespace test
 }  // namespace aura