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

trunk/src/ash/drag_drop/drag_drop_interactive_uitest.cc

 // Copyright (c) 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/drag_drop/drag_drop_controller.h"
 
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 115 matching lines @@
 #define MAYBE_DragDropAcrossMultiDisplay DragDropAcrossMultiDisplay
 #endif
 
 // Test if the mouse gets moved properly to another display
 // during drag & drop operation.
 TEST_F(DragDropTest, MAYBE_DragDropAcrossMultiDisplay) {
   if (!SupportsMultipleDisplays())
     return;
 
   UpdateDisplay("400x400,400x400");
-  aura::Window::Windows root_windows =
+  Shell::RootWindowList root_windows =
       Shell::GetInstance()->GetAllRootWindows();
   views::View* draggable_view = new DraggableView();
   draggable_view->set_drag_controller(NULL);
   draggable_view->SetBounds(0, 0, 100, 100);
   views::Widget* source =
       CreateWidget(draggable_view, gfx::Rect(0, 0, 100, 100));
 
   TargetView* target_view = new TargetView();
   target_view->SetBounds(0, 0, 100, 100);
   views::Widget* target =
       CreateWidget(target_view, gfx::Rect(400, 0, 100, 100));
 
   // Make sure they're on the different root windows.
   EXPECT_EQ(root_windows[0], source->GetNativeView()->GetRootWindow());
   EXPECT_EQ(root_windows[1], target->GetNativeView()->GetRootWindow());
 
   ui_controls::SendMouseMoveNotifyWhenDone(
       10, 10, base::Bind(&DragDropAcrossMultiDisplay_Step1));
 
   base::MessageLoop::current()->Run();
 
   EXPECT_TRUE(target_view->dropped());
 
   source->Close();
   target->Close();
 }
 
 }  // namespace internal
 }  // namespace ash