Index: ash/wm/activation_controller_unittest.cc |
=================================================================== |
--- ash/wm/activation_controller_unittest.cc (revision 126791) |
+++ ash/wm/activation_controller_unittest.cc (working copy) |
@@ -191,7 +191,7 @@ |
scoped_ptr<aura::Window> w1(aura::test::CreateTestWindowWithDelegate( |
&wd, 1, gfx::Rect(100, 100), NULL)); |
ad1.SetWindow(w1.get()); |
- EXPECT_EQ(NULL, wm::GetActiveWindow()); |
+ EXPECT_TRUE(wm::IsActiveWindow(NULL)); |
// Clicking on an activatable window activtes the window. |
aura::test::EventGenerator generator(Shell::GetRootWindow(), w1.get()); |
@@ -259,8 +259,8 @@ |
// Should not have gotten a OnLostActive yet. |
EXPECT_EQ(0, ad1.lost_active_count()); |
- // Deactivate the active window. |
- wm::DeactivateWindow(w1.get()); |
+ // ActivateWindow(NULL) should deactivate the active window. |
+ wm::ActivateWindow(NULL); |
EXPECT_FALSE(wm::IsActiveWindow(w1.get())); |
EXPECT_EQ(1, ad1.lost_active_count()); |
EXPECT_FALSE(ad1.window_was_active()); |