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 f3b8d655c35277aee553f7afe56cefacea558983..a9996c25eb00c571c505633891990b2f88facc1e 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()->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]->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()); |
const gfx::Point window_pos(100, 100); |
window_->SetBoundsInScreen( |
@@ -178,13 +178,17 @@ TEST_F(ScreenPositionControllerTest, MAYBE_ConvertHostPointToScreenHiDPI) { |
aura::Window::Windows root_windows = |
Shell::GetInstance()->GetAllRootWindows(); |
EXPECT_EQ("100,100", |
- root_windows[0]->GetDispatcher()->GetHostOrigin().ToString()); |
+ root_windows[0]->GetDispatcher()->host()-> |
+ GetBounds().origin().ToString()); |
EXPECT_EQ("200x200", |
- root_windows[0]->GetDispatcher()->GetHostSize().ToString()); |
+ root_windows[0]->GetDispatcher()->host()-> |
+ GetBounds().size().ToString()); |
EXPECT_EQ("100,500", |
- root_windows[1]->GetDispatcher()->GetHostOrigin().ToString()); |
+ root_windows[1]->GetDispatcher()->host()-> |
+ GetBounds().origin().ToString()); |
EXPECT_EQ("200x200", |
- root_windows[1]->GetDispatcher()->GetHostSize().ToString()); |
+ root_windows[1]->GetDispatcher()->host()-> |
+ GetBounds().size().ToString()); |
// Put |window_| to the primary 2x display. |
window_->SetBoundsInScreen(gfx::Rect(20, 20, 50, 50), |