Window ownership -> WindowTreeHost

ash/display/screen_position_controller_unittest.cc

Index: ash/display/screen_position_controller_unittest.cc
diff --git a/ash/display/screen_position_controller_unittest.cc b/ash/display/screen_position_controller_unittest.cc
index d51ec0a3e833af5a99338e59e4b34ff741356ac5..347ff7f8fb68f820035863eee98aa1f7fb33795c 100644
--- a/ash/display/screen_position_controller_unittest.cc
+++ b/ash/display/screen_position_controller_unittest.cc
@@ -89,14 +89,14 @@ TEST_F(ScreenPositionControllerTest, MAYBE_ConvertHostPointToScreen) {
 
   aura::Window::Windows root_windows =
       Shell::GetInstance()->GetAllRootWindows();
-  EXPECT_EQ("100,100", root_windows[0]->GetDispatcher()->host()->
-      GetBounds().origin().ToString());
-  EXPECT_EQ("200x200", root_windows[0]->GetDispatcher()->host()->
-      GetBounds().size().ToString());
-  EXPECT_EQ("100,500", root_windows[1]->GetDispatcher()->host()->
-      GetBounds().origin().ToString());
-  EXPECT_EQ("200x200", root_windows[1]->GetDispatcher()->host()->
-      GetBounds().size().ToString());
+  EXPECT_EQ("100,100",
+            root_windows[0]->GetHost()->GetBounds().origin().ToString());
+  EXPECT_EQ("200x200",
+            root_windows[0]->GetHost()->GetBounds().size().ToString());
+  EXPECT_EQ("100,500",
+            root_windows[1]->GetHost()->GetBounds().origin().ToString());
+  EXPECT_EQ("200x200",
+            root_windows[1]->GetHost()->GetBounds().size().ToString());
 
   const gfx::Point window_pos(100, 100);
   window_->SetBoundsInScreen(
@@ -178,16 +178,16 @@ TEST_F(ScreenPositionControllerTest, MAYBE_ConvertHostPointToScreenHiDPI) {
   aura::Window::Windows root_windows =
       Shell::GetInstance()->GetAllRootWindows();
   EXPECT_EQ("100,100",
-            root_windows[0]->GetDispatcher()->host()->
+            root_windows[0]->GetHost()->
                 GetBounds().origin().ToString());
   EXPECT_EQ("200x200",
-            root_windows[0]->GetDispatcher()->host()->
+            root_windows[0]->GetHost()->
                 GetBounds().size().ToString());
   EXPECT_EQ("100,500",
-            root_windows[1]->GetDispatcher()->host()->
+            root_windows[1]->GetHost()->
                 GetBounds().origin().ToString());
   EXPECT_EQ("200x200",
-            root_windows[1]->GetDispatcher()->host()->
+            root_windows[1]->GetHost()->
                 GetBounds().size().ToString());
 
   // Put |window_| to the primary 2x display.