diff options
| author | glider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-17 12:49:58 +0000 |
|---|---|---|
| committer | glider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-17 12:49:58 +0000 |
| commit | 08f11df43dfbcc976ae591e85936c5ba32763a0f (patch) | |
| tree | 8cae2a5ea8ff1fee43050619016f4639a0e2c688 | |
| parent | c2cf695edaeab017ef8d0ac8efa75aed2228b506 (diff) | |
| download | chromium_src-08f11df43dfbcc976ae591e85936c5ba32763a0f.zip chromium_src-08f11df43dfbcc976ae591e85936c5ba32763a0f.tar.gz chromium_src-08f11df43dfbcc976ae591e85936c5ba32763a0f.tar.bz2 | |
Annotate MessageLoopProxyTest.PostTaskAndReply_DeadReplyLoopDoesNotDelete as having memory leaks
Revert the corresponding suppression.
BUG=86301
TBR=ajwong
Review URL: https://chromiumcodereview.appspot.com/9417004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122501 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | base/message_loop_proxy_unittest.cc | 5 | ||||
| -rw-r--r-- | tools/heapcheck/suppressions.txt | 8 |
2 files changed, 4 insertions, 9 deletions
diff --git a/base/message_loop_proxy_unittest.cc b/base/message_loop_proxy_unittest.cc index aeb2f0c..738a336 100644 --- a/base/message_loop_proxy_unittest.cc +++ b/base/message_loop_proxy_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -6,6 +6,7 @@ #include "base/atomic_sequence_num.h" #include "base/bind.h" +#include "base/debug/leak_annotations.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" @@ -209,6 +210,8 @@ TEST_F(MessageLoopProxyTest, PostTaskAndReply_SameLoop) { } TEST_F(MessageLoopProxyTest, PostTaskAndReply_DeadReplyLoopDoesNotDelete) { + // Annotate the scope as having memory leaks to suppress heapchecker reports. + ANNOTATE_SCOPED_MEMORY_LEAK; MessageLoop* task_run_on = NULL; MessageLoop* task_deleted_on = NULL; int task_delete_order = -1; diff --git a/tools/heapcheck/suppressions.txt b/tools/heapcheck/suppressions.txt index b84dc40..7341d32 100644 --- a/tools/heapcheck/suppressions.txt +++ b/tools/heapcheck/suppressions.txt @@ -76,7 +76,6 @@ Heapcheck:Leak fun:IA__FcCharSetCreate } - { bug_51988_a Heapcheck:Leak @@ -217,13 +216,6 @@ ... fun:tracked_objects::ThreadData::TallyA* } -# http://crbug.com/86301 -{ - Intentional leak in MessageLoopProxyTest.PostTaskAndReply_DeadReplyLoopDoesNotDelete - Heapcheck:Leak - ... - fun:*MessageLoopProxyTest_PostTaskAndReply_DeadReplyLoopDoesNotDelete_Test* -} #----------------------------------------------------------------------- # 3. Suppressions for real chromium bugs that are not yet fixed. |