| Index: ash/monitor/multi_monitor_manager_unittest.cc
|
| diff --git a/ash/monitor/multi_monitor_manager_unittest.cc b/ash/monitor/multi_monitor_manager_unittest.cc
|
| index 60ea1ac8153f3f751a45797af3bf8631de706b7f..5ba3ebd70ddd926d1f8a3fb0cb568a5883666aaa 100644
|
| --- a/ash/monitor/multi_monitor_manager_unittest.cc
|
| +++ b/ash/monitor/multi_monitor_manager_unittest.cc
|
| @@ -51,10 +51,10 @@ class MultiMonitorManagerTest : public test::AshTestBase,
|
| virtual void SetUp() OVERRIDE {
|
| AshTestBase::SetUp();
|
| monitor_manager()->AddObserver(this);
|
| - Shell::GetRootWindow()->AddObserver(this);
|
| + Shell::GetPrimaryRootWindow()->AddObserver(this);
|
| }
|
| virtual void TearDown() OVERRIDE {
|
| - Shell::GetRootWindow()->RemoveObserver(this);
|
| + Shell::GetPrimaryRootWindow()->RemoveObserver(this);
|
| monitor_manager()->RemoveObserver(this);
|
| AshTestBase::TearDown();
|
| }
|
| @@ -94,7 +94,7 @@ class MultiMonitorManagerTest : public test::AshTestBase,
|
|
|
| // aura::WindowObserver overrides:
|
| virtual void OnWindowDestroying(aura::Window* window) {
|
| - ASSERT_EQ(Shell::GetRootWindow(), window);
|
| + ASSERT_EQ(Shell::GetPrimaryRootWindow(), window);
|
| root_window_destroyed_ = true;
|
| }
|
|
|
|
|