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

trunk/src/ash/display/screen_position_controller_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/display/screen_position_controller.h"
 
 #include "ash/display/display_manager.h"
 #include "ash/screen_ash.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
@@ skipping 69 matching lines @@
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ScreenPositionControllerTest);
 };
 
 }  // namespace
 
 TEST_F(ScreenPositionControllerTest, MAYBE_ConvertHostPointToScreen) {
   UpdateDisplay("100+100-200x200,100+500-200x200");
 
-  aura::Window::Windows root_windows =
+  Shell::RootWindowList root_windows =
       Shell::GetInstance()->GetAllRootWindows();
-  EXPECT_EQ("100,100",
-            root_windows[0]->GetDispatcher()->GetHostOrigin().ToString());
-  EXPECT_EQ("200x200",
-            root_windows[0]->GetDispatcher()->GetHostSize().ToString());
-  EXPECT_EQ("100,500",
-            root_windows[1]->GetDispatcher()->GetHostOrigin().ToString());
-  EXPECT_EQ("200x200",
-            root_windows[1]->GetDispatcher()->GetHostSize().ToString());
+  EXPECT_EQ("100,100", root_windows[0]->GetHostOrigin().ToString());
+  EXPECT_EQ("200x200", root_windows[0]->GetHostSize().ToString());
+  EXPECT_EQ("100,500", root_windows[1]->GetHostOrigin().ToString());
+  EXPECT_EQ("200x200", root_windows[1]->GetHostSize().ToString());
 
   const gfx::Point window_pos(100, 100);
   window_->SetBoundsInScreen(
       gfx::Rect(window_pos, gfx::Size(100, 100)),
       Shell::GetScreen()->GetDisplayNearestPoint(window_pos));
   SetSecondaryDisplayLayout(DisplayLayout::RIGHT);
   // The point is on the primary root window.
   EXPECT_EQ("50,50", ConvertHostPointToScreen(50, 50));
   // The point is out of the all root windows.
   EXPECT_EQ("250,250", ConvertHostPointToScreen(250, 250));
@@ skipping 58 matching lines @@
   EXPECT_EQ("50,-150", ConvertHostPointToScreen(50, 50));
   // The point is out of the all root windows.
   EXPECT_EQ("250,50", ConvertHostPointToScreen(250, 250));
   // The point is on the primary root window.
   EXPECT_EQ("50,0", ConvertHostPointToScreen(50, -400));
 }
 
 TEST_F(ScreenPositionControllerTest, MAYBE_ConvertHostPointToScreenHiDPI) {
   UpdateDisplay("100+100-200x200*2,100+500-200x200");
 
-  aura::Window::Windows root_windows =
+  Shell::RootWindowList root_windows =
       Shell::GetInstance()->GetAllRootWindows();
-  EXPECT_EQ("100,100",
-            root_windows[0]->GetDispatcher()->GetHostOrigin().ToString());
-  EXPECT_EQ("200x200",
-            root_windows[0]->GetDispatcher()->GetHostSize().ToString());
-  EXPECT_EQ("100,500",
-            root_windows[1]->GetDispatcher()->GetHostOrigin().ToString());
-  EXPECT_EQ("200x200",
-            root_windows[1]->GetDispatcher()->GetHostSize().ToString());
+  EXPECT_EQ("100,100", root_windows[0]->GetHostOrigin().ToString());
+  EXPECT_EQ("200x200", root_windows[0]->GetHostSize().ToString());
+  EXPECT_EQ("100,500", root_windows[1]->GetHostOrigin().ToString());
+  EXPECT_EQ("200x200", root_windows[1]->GetHostSize().ToString());
 
   // Put |window_| to the primary 2x display.
   window_->SetBoundsInScreen(gfx::Rect(20, 20, 50, 50),
                              Shell::GetScreen()->GetPrimaryDisplay());
   // (30, 30) means the host coordinate, so the point is still on the primary
   // root window.  Since it's 2x, the specified native point was halved.
   EXPECT_EQ("15,15", ConvertHostPointToScreen(30, 30));
   // Similar to above but the point is out of the all root windows.
   EXPECT_EQ("200,200", ConvertHostPointToScreen(400, 400));
   // Similar to above but the point is on the secondary display.
@@ skipping 22 matching lines @@
   EXPECT_EQ("70,149", ConvertHostPointToScreen(50, 70));
   // The point is out of the host windows.
   EXPECT_EQ("250,-51", ConvertHostPointToScreen(250, 250));
   // The point is on the 2nd host. Point on 2nd host (30,150) -
   // rotate 270 clockwise -> (149, 30) - layout [+(200,0)] -> (349,30).
   EXPECT_EQ("349,30", ConvertHostPointToScreen(30, 450));
 
   // Move |window_| to the 2nd.
   window_->SetBoundsInScreen(gfx::Rect(300, 20, 50, 50),
                              ScreenAsh::GetSecondaryDisplay());
-  aura::Window::Windows root_windows =
+  Shell::RootWindowList root_windows =
       Shell::GetInstance()->GetAllRootWindows();
   EXPECT_EQ(root_windows[1], window_->GetRootWindow());
 
   // The point is on the 2nd host. (50,70) on 2n host -
   // roatate 270 clockwise -> (129,50) -layout [+(200,0)] -> (329,50)
   EXPECT_EQ("329,50", ConvertHostPointToScreen(50, 70));
   // The point is out of the host windows.
   EXPECT_EQ("449,50", ConvertHostPointToScreen(50, -50));
   // The point is on the 2nd host. Point on 2nd host (50,50) -
   // rotate 90 clockwise -> (50, 149)
@@ skipping 11 matching lines @@
   EXPECT_EQ("45,45", ConvertHostPointToScreen(60, 60));
   // The point is out of the host windows.
   EXPECT_EQ("45,225", ConvertHostPointToScreen(60, 300));
   // The point is on the 2nd host. Point on 2nd host (60,150) -
   // - screen [+(150,0)]
   EXPECT_EQ("210,49", ConvertHostPointToScreen(60, 450));
 
   // Move |window_| to the 2nd.
   window_->SetBoundsInScreen(gfx::Rect(300, 20, 50, 50),
                              ScreenAsh::GetSecondaryDisplay());
-  aura::Window::Windows root_windows =
+  Shell::RootWindowList root_windows =
       Shell::GetInstance()->GetAllRootWindows();
   EXPECT_EQ(root_windows[1], window_->GetRootWindow());
 
   // The point is on the 2nd host. (50,70) - ro
   EXPECT_EQ("210,70", ConvertHostPointToScreen(60, 70));
   // The point is out of the host windows.
   EXPECT_EQ("210,-50", ConvertHostPointToScreen(60, -50));
   // The point is on the 2nd host. Point on 1nd host (60, 60)
   // 1/2 * 1.5 = (45,45)
   EXPECT_EQ("45,45", ConvertHostPointToScreen(60, -340));
 }
 
 }  // namespace test
 }  // namespace ash