diff options
| author | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-15 15:35:36 +0000 |
|---|---|---|
| committer | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-15 15:35:36 +0000 |
| commit | 8a08fa1fbc6c430e15af07ebec5843be6e97cb4d (patch) | |
| tree | 94f004f28635d362ea09e202ec4ccedbc6025b33 /ash/wm/activation_controller_unittest.cc | |
| parent | b016fc8f57b48c81b2985aac394dbc71fd60396c (diff) | |
| download | chromium_src-8a08fa1fbc6c430e15af07ebec5843be6e97cb4d.zip chromium_src-8a08fa1fbc6c430e15af07ebec5843be6e97cb4d.tar.gz chromium_src-8a08fa1fbc6c430e15af07ebec5843be6e97cb4d.tar.bz2 | |
Second try for
https://chromiumcodereview.appspot.com/9689047/
with fix to allow for special conditions under test
BUG=115650
TEST=LauncherUpdaterTest.*
TBR=sky
Review URL: https://chromiumcodereview.appspot.com/9702072
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126917 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/activation_controller_unittest.cc')
| -rw-r--r-- | ash/wm/activation_controller_unittest.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ash/wm/activation_controller_unittest.cc b/ash/wm/activation_controller_unittest.cc index 32e12b1..68ce950 100644 --- a/ash/wm/activation_controller_unittest.cc +++ b/ash/wm/activation_controller_unittest.cc @@ -191,7 +191,7 @@ TEST_F(ActivationControllerTest, ClickOnMenu) { scoped_ptr<aura::Window> w1(aura::test::CreateTestWindowWithDelegate( &wd, 1, gfx::Rect(100, 100), NULL)); ad1.SetWindow(w1.get()); - EXPECT_TRUE(wm::IsActiveWindow(NULL)); + EXPECT_EQ(NULL, wm::GetActiveWindow()); // Clicking on an activatable window activtes the window. aura::test::EventGenerator generator(Shell::GetRootWindow(), w1.get()); @@ -259,8 +259,8 @@ TEST_F(ActivationControllerTest, NotActiveInLostActive) { // Should not have gotten a OnLostActive yet. EXPECT_EQ(0, ad1.lost_active_count()); - // ActivateWindow(NULL) should deactivate the active window. - wm::ActivateWindow(NULL); + // Deactivate the active window. + wm::DeactivateWindow(w1.get()); EXPECT_FALSE(wm::IsActiveWindow(w1.get())); EXPECT_EQ(1, ad1.lost_active_count()); EXPECT_FALSE(ad1.window_was_active()); |