diff options
author | mukai <mukai@chromium.org> | 2014-12-17 02:11:39 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-12-17 10:12:01 +0000 |
commit | 8074902d32c9f36d3be05610229f4041d1bc5b80 (patch) | |
tree | c5da7b7530576030ea5eecc71865df710da924b7 /ash/wm/window_manager_unittest.cc | |
parent | d885f216d2e645534ffb8dbb935a3947ff3f7718 (diff) | |
download | chromium_src-8074902d32c9f36d3be05610229f4041d1bc5b80.zip chromium_src-8074902d32c9f36d3be05610229f4041d1bc5b80.tar.gz chromium_src-8074902d32c9f36d3be05610229f4041d1bc5b80.tar.bz2 |
Allows OnAppTerminating at AshTestBase::TearDown().
Adding OnAppTerminating causes some failures. This CL also includes
the fixes for them.
OverlayEventFilterTest.CancelAtActivating:
- OverlayEventFilter::Cancel() is called, but that does not cleanup
|delegate_|, therefore further OnAppTerminating() invokes Cancel()
to already canceled delegate_.
PartialScreenshotViewTest.DontStartOverOverlay:
- delegate should be deactivated before it's removed.
RootWindowControllerTest.DontDeleteWindowsNotOwnedByParent:
- this test case explicitly invokes CloseAllChildWindows(), therefore
it cleans up all of the containers.
- SessionStateAnimatorImpl assumed containers still exist when
OnAppTerminating() is invoked.
WindowManagerTest.TestCursorClientObserver:
- observer_a is added to cursor_manager, but not destructed without
calling RemoveObserver().
BUG=None
R=oshima@chromium.org
TEST=ash_unittests
Review URL: https://codereview.chromium.org/809603008
Cr-Commit-Position: refs/heads/master@{#308772}
Diffstat (limited to 'ash/wm/window_manager_unittest.cc')
-rw-r--r-- | ash/wm/window_manager_unittest.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ash/wm/window_manager_unittest.cc b/ash/wm/window_manager_unittest.cc index 6a51a0f..61aaaf2 100644 --- a/ash/wm/window_manager_unittest.cc +++ b/ash/wm/window_manager_unittest.cc @@ -832,6 +832,8 @@ TEST_F(WindowManagerTest, TestCursorClientObserver) { EXPECT_TRUE(observer_a.did_visibility_change()); EXPECT_FALSE(observer_b.did_visibility_change()); EXPECT_TRUE(observer_a.is_cursor_visible()); + + cursor_manager->RemoveObserver(&observer_a); } #endif // defined(OS_CHROMEOS) |