diff options
| author | mazda@chromium.org <mazda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-07 22:34:38 +0000 |
|---|---|---|
| committer | mazda@chromium.org <mazda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-07 22:34:38 +0000 |
| commit | 0570d9bfc8db4e3e1e8e124d0f16869b59e8deed (patch) | |
| tree | 2789039230ec3dc2a117b4175340ca26c544d5d9 | |
| parent | c297d3a13ae36bf2f574e55b3f1f9494b3f98e7b (diff) | |
| download | chromium_src-0570d9bfc8db4e3e1e8e124d0f16869b59e8deed.zip chromium_src-0570d9bfc8db4e3e1e8e124d0f16869b59e8deed.tar.gz chromium_src-0570d9bfc8db4e3e1e8e124d0f16869b59e8deed.tar.bz2 | |
Fix a leak in KeyboardOverlayViewTest.OpenAcceleratorsClose.
BUG=167165
Review URL: https://codereview.chromium.org/11648037
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@175400 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | ash/keyboard_overlay/keyboard_overlay_view_unittest.cc | 7 | ||||
| -rw-r--r-- | tools/heapcheck/suppressions.txt | 6 | ||||
| -rw-r--r-- | tools/valgrind/memcheck/suppressions.txt | 15 |
3 files changed, 4 insertions, 24 deletions
diff --git a/ash/keyboard_overlay/keyboard_overlay_view_unittest.cc b/ash/keyboard_overlay/keyboard_overlay_view_unittest.cc index fcb82ce..87afe05 100644 --- a/ash/keyboard_overlay/keyboard_overlay_view_unittest.cc +++ b/ash/keyboard_overlay/keyboard_overlay_view_unittest.cc @@ -24,9 +24,10 @@ bool operator==(const KeyboardOverlayView::KeyEventData& lhs, // Verifies that the accelerators that open the keyboard overlay close it. TEST_F(KeyboardOverlayViewTest, OpenAcceleratorsClose) { - KeyboardOverlayView* view = new KeyboardOverlayView( + ui::test::TestWebDialogDelegate delegate(GURL("chrome://keyboardoverlay")); + KeyboardOverlayView view( Shell::GetInstance()->browser_context(), - new ui::test::TestWebDialogDelegate(GURL("chrome://keyboardoverlay")), + &delegate, new ui::test::TestWebContentsHandler); for (size_t i = 0; i < kAcceleratorDataLength; ++i) { if (kAcceleratorData[i].action != SHOW_KEYBOARD_OVERLAY) @@ -37,7 +38,7 @@ TEST_F(KeyboardOverlayViewTest, OpenAcceleratorsClose) { open_key_data.keycode, open_key_data.modifiers, false); - EXPECT_TRUE(view->IsCancelingKeyEvent(&open_key)); + EXPECT_TRUE(view.IsCancelingKeyEvent(&open_key)); } } diff --git a/tools/heapcheck/suppressions.txt b/tools/heapcheck/suppressions.txt index e7bdc45..3b948d8 100644 --- a/tools/heapcheck/suppressions.txt +++ b/tools/heapcheck/suppressions.txt @@ -1629,9 +1629,3 @@ fun:ash::CursorManager::SetDeviceScaleFactor fun:ash::Shell::Init } -{ - bug_167165 - Heapcheck:Leak - ... - fun:ash::KeyboardOverlayViewTest_OpenAcceleratorsClose_Test::TestBody -} diff --git a/tools/valgrind/memcheck/suppressions.txt b/tools/valgrind/memcheck/suppressions.txt index 57d8200..b745e71 100644 --- a/tools/valgrind/memcheck/suppressions.txt +++ b/tools/valgrind/memcheck/suppressions.txt @@ -6403,21 +6403,6 @@ fun:_ZN4base12_GLOBAL__N_110ThreadFuncEPv } { - bug_167165a - Memcheck:Leak - fun:_Znw* - ... - fun:_ZN5views13WebDialogViewC2EPN7content14BrowserContextEPN2ui17WebDialogDelegateEPNS4_28WebDialogWebContentsDelegate18WebContentsHandlerE - fun:_ZN3ash19KeyboardOverlayViewC1EPN7content14BrowserContextEPN2ui17WebDialogDelegateEPNS4_28WebDialogWebContentsDelegate18WebContentsHandlerE - fun:_ZN3ash50KeyboardOverlayViewTest_OpenAcceleratorsClose_Test8TestBodyEv -} -{ - bug_167165b - Memcheck:Leak - fun:_Znw* - fun:_ZN3ash50KeyboardOverlayViewTest_OpenAcceleratorsClose_Test8TestBodyEv -} -{ bug_167175a Memcheck:Leak ... |