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

trunk/src/ash/wm/overview/window_selector_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/launcher/launcher.h"
 #include "ash/root_window_controller.h"
 #include "ash/screen_ash.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
@@ skipping 673 matching lines @@
   EXPECT_TRUE(wm::IsActiveWindow(child1.get()));
 }
 
 // Tests that windows remain on the display they are currently on in overview
 // mode.
 TEST_F(WindowSelectorTest, MultipleDisplays) {
   if (!SupportsMultipleDisplays())
     return;
 
   UpdateDisplay("600x400,600x400");
-  aura::Window::Windows root_windows = Shell::GetAllRootWindows();
+  Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
   gfx::Rect bounds1(0, 0, 400, 400);
   gfx::Rect bounds2(650, 0, 400, 400);
 
   scoped_ptr<aura::Window> window1(CreateWindow(bounds1));
   scoped_ptr<aura::Window> window2(CreateWindow(bounds1));
   scoped_ptr<aura::Window> window3(CreateWindow(bounds2));
   scoped_ptr<aura::Window> window4(CreateWindow(bounds2));
   scoped_ptr<aura::Window> panel1(CreatePanelWindow(bounds1));
   scoped_ptr<aura::Window> panel2(CreatePanelWindow(bounds1));
   scoped_ptr<aura::Window> panel3(CreatePanelWindow(bounds2));
@@ skipping 41 matching lines @@
   EXPECT_FALSE(WindowsOverlapping(panel1.get(), panel3.get()));
 }
 
 // Verifies that the single display overview used during alt tab cycling uses
 // the display of the initial window by default.
 TEST_F(WindowSelectorTest, CycleOverviewUsesInitialDisplay) {
   if (!SupportsMultipleDisplays())
     return;
 
   UpdateDisplay("400x400,400x400");
-  aura::Window::Windows root_windows = Shell::GetAllRootWindows();
+  Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
 
   scoped_ptr<aura::Window> window1(CreateWindow(gfx::Rect(0, 0, 100, 100)));
   scoped_ptr<aura::Window> window2(CreateWindow(gfx::Rect(450, 0, 100, 100)));
   EXPECT_EQ(root_windows[0], window1->GetRootWindow());
   EXPECT_EQ(root_windows[1], window2->GetRootWindow());
   wm::ActivateWindow(window2.get());
   wm::ActivateWindow(window1.get());
   EXPECT_EQ(root_windows[0], Shell::GetTargetRootWindow());
 
   Cycle(WindowSelector::FORWARD);
   FireOverviewStartTimer();
 
   EXPECT_TRUE(root_windows[0]->GetBoundsInScreen().Contains(
       ToEnclosingRect(GetTransformedTargetBounds(window1.get()))));
   EXPECT_TRUE(root_windows[0]->GetBoundsInScreen().Contains(
       ToEnclosingRect(GetTransformedTargetBounds(window2.get()))));
   StopCycling();
 }
 
 // Verifies that the windows being shown on another display are copied.
 TEST_F(WindowSelectorTest, CycleMultipleDisplaysCopiesWindows) {
   if (!SupportsMultipleDisplays())
     return;
 
   UpdateDisplay("400x400,400x400");
-  aura::Window::Windows root_windows = Shell::GetAllRootWindows();
+  Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
 
   gfx::Rect root1_rect(0, 0, 100, 100);
   gfx::Rect root2_rect(450, 0, 100, 100);
   scoped_ptr<aura::Window> unmoved1(CreateWindow(root2_rect));
   scoped_ptr<aura::Window> unmoved2(CreateWindow(root2_rect));
   scoped_ptr<aura::Window> moved1_trans_parent(CreateWindow(root1_rect));
   scoped_ptr<aura::Window> moved1(CreateWindow(root1_rect));
   unmoved1->SetName("unmoved1");
   unmoved2->SetName("unmoved2");
   moved1->SetName("moved1");
@@ skipping 48 matching lines @@
   EXPECT_TRUE(!GetCopyWindow(moved1_trans_parent.get()));
 }
 
 // Tests that beginning to cycle from overview mode moves windows to the
 // active display.
 TEST_F(WindowSelectorTest, MultipleDisplaysOverviewTransitionToCycle) {
   if (!SupportsMultipleDisplays())
     return;
 
   UpdateDisplay("400x400,400x400");
-  aura::Window::Windows root_windows = Shell::GetAllRootWindows();
+  Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
 
   scoped_ptr<aura::Window> window1(CreateWindow(gfx::Rect(0, 0, 100, 100)));
   scoped_ptr<aura::Window> window2(CreateWindow(gfx::Rect(450, 0, 100, 100)));
   EXPECT_EQ(root_windows[0], window1->GetRootWindow());
   EXPECT_EQ(root_windows[1], window2->GetRootWindow());
   wm::ActivateWindow(window2.get());
   wm::ActivateWindow(window1.get());
 
   ToggleOverview();
   EXPECT_TRUE(root_windows[0]->GetBoundsInScreen().Contains(
       ToEnclosingRect(GetTransformedTargetBounds(window1.get()))));
   EXPECT_TRUE(root_windows[1]->GetBoundsInScreen().Contains(
       ToEnclosingRect(GetTransformedTargetBounds(window2.get()))));
 
   Cycle(WindowSelector::FORWARD);
   EXPECT_TRUE(root_windows[0]->GetBoundsInScreen().Contains(
       ToEnclosingRect(GetTransformedTargetBounds(window1.get()))));
   EXPECT_TRUE(root_windows[0]->GetBoundsInScreen().Contains(
       ToEnclosingRect(GetTransformedTargetBounds(window2.get()))));
   StopCycling();
 }
 
 // Tests that a bounds change during overview is corrected for.
 TEST_F(WindowSelectorTest, BoundsChangeDuringCycleOnOtherDisplay) {
   if (!SupportsMultipleDisplays())
     return;
 
   UpdateDisplay("400x400,400x400");
-  aura::Window::Windows root_windows = Shell::GetAllRootWindows();
+  Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
 
   scoped_ptr<aura::Window> window1(CreateWindow(gfx::Rect(0, 0, 100, 100)));
   scoped_ptr<aura::Window> window2(CreateWindow(gfx::Rect(450, 0, 100, 100)));
   scoped_ptr<aura::Window> window3(CreateWindow(gfx::Rect(450, 0, 100, 100)));
   EXPECT_EQ(root_windows[0], window1->GetRootWindow());
   EXPECT_EQ(root_windows[1], window2->GetRootWindow());
   EXPECT_EQ(root_windows[1], window3->GetRootWindow());
   wm::ActivateWindow(window1.get());
   wm::ActivateWindow(window2.get());
   wm::ActivateWindow(window3.get());
@@ skipping 12 matching lines @@
       ToEnclosingRect(GetTransformedTargetBounds(window1.get()));
   EXPECT_EQ(overview_bounds.x(), new_overview_bounds.x());
   EXPECT_EQ(overview_bounds.y(), new_overview_bounds.y());
   EXPECT_EQ(overview_bounds.width(), new_overview_bounds.width());
   EXPECT_EQ(overview_bounds.height(), new_overview_bounds.height());
   StopCycling();
 }
 
 }  // namespace internal
 }  // namespace ash