| Index: ash/display/display_manager_unittest.cc
|
| diff --git a/ash/display/display_manager_unittest.cc b/ash/display/display_manager_unittest.cc
|
| index e2166723b84dbab3e22b333e2b34a93f29e5375c..e51560141a107f6e370266c79b9e8145043a2be5 100644
|
| --- a/ash/display/display_manager_unittest.cc
|
| +++ b/ash/display/display_manager_unittest.cc
|
| @@ -1432,7 +1432,7 @@ TEST_F(DisplayManagerTest, NotifyPrimaryChange) {
|
| if (!SupportsMultipleDisplays())
|
| return;
|
| UpdateDisplay("500x500,500x500");
|
| - ash::Shell::GetInstance()->window_tree_host_manager()->SwapPrimaryDisplay();
|
| + Shell::GetInstance()->window_tree_host_manager()->SwapPrimaryDisplayForTest();
|
| reset();
|
| UpdateDisplay("500x500");
|
| EXPECT_FALSE(changed_metrics() & gfx::DisplayObserver::DISPLAY_METRIC_BOUNDS);
|
| @@ -1442,7 +1442,7 @@ TEST_F(DisplayManagerTest, NotifyPrimaryChange) {
|
| gfx::DisplayObserver::DISPLAY_METRIC_PRIMARY);
|
|
|
| UpdateDisplay("500x500,500x500");
|
| - ash::Shell::GetInstance()->window_tree_host_manager()->SwapPrimaryDisplay();
|
| + Shell::GetInstance()->window_tree_host_manager()->SwapPrimaryDisplayForTest();
|
| reset();
|
| UpdateDisplay("500x400");
|
| EXPECT_TRUE(changed_metrics() & gfx::DisplayObserver::DISPLAY_METRIC_BOUNDS);
|
|
|