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

trunk/src/ash/shelf/shelf_widget_unittest.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/shelf/shelf_widget.h"
 
 #include "ash/launcher/launcher.h"
 #include "ash/launcher/launcher_button.h"
 #include "ash/launcher/launcher_model.h"
 #include "ash/root_window_controller.h"
@@ skipping 71 matching lines @@
   {
     SCOPED_TRACE("Single Left");
     TestLauncherAlignment(Shell::GetPrimaryRootWindow(),
                           SHELF_ALIGNMENT_LEFT,
                           "47,0 353x400");
   }
   if (!SupportsMultipleDisplays())
     return;
 
   UpdateDisplay("300x300,500x500");
-  aura::Window::Windows root_windows = Shell::GetAllRootWindows();
+  Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
   {
     SCOPED_TRACE("Primary Bottom");
     TestLauncherAlignment(root_windows[0],
                           SHELF_ALIGNMENT_BOTTOM,
                           "0,0 300x253");
   }
   {
     SCOPED_TRACE("Primary Right");
     TestLauncherAlignment(root_windows[0],
                           SHELF_ALIGNMENT_RIGHT,
@@ skipping 82 matching lines @@
   const int status_width =
       shelf->status_area_widget()->GetWindowBoundsInScreen().width();
   EXPECT_GT(status_width, 0);
   EXPECT_EQ(status_width,
             shelf->GetContentsView()->width() -
                 test::LauncherTestAPI(launcher).shelf_view()->width());
 }
 #endif
 
 }  // namespace ash