diff options
| author | asargent@chromium.org <asargent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-25 21:16:22 +0000 |
|---|---|---|
| committer | asargent@chromium.org <asargent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-25 21:16:22 +0000 |
| commit | 819faeb0cf19a12f586aef3780d8b80ff1cab72f (patch) | |
| tree | 305fab8069a733df999cbb563564ec8353bb3c39 | |
| parent | da26d737133f31b8abdf71311e9157a517821fda (diff) | |
| download | chromium_src-819faeb0cf19a12f586aef3780d8b80ff1cab72f.zip chromium_src-819faeb0cf19a12f586aef3780d8b80ff1cab72f.tar.gz chromium_src-819faeb0cf19a12f586aef3780d8b80ff1cab72f.tar.bz2 | |
Fix a unit test leak.
These were introduced by revision 50779 (http://codereview.chromium.org/2867008)
BUG=47471
TEST=none
Review URL: http://codereview.chromium.org/2808027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50891 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/extensions/extension_menu_manager_unittest.cc | 6 | ||||
| -rw-r--r-- | tools/heapcheck/suppressions.txt | 6 | ||||
| -rw-r--r-- | tools/valgrind/memcheck/suppressions.txt | 7 |
3 files changed, 5 insertions, 14 deletions
diff --git a/chrome/browser/extensions/extension_menu_manager_unittest.cc b/chrome/browser/extensions/extension_menu_manager_unittest.cc index 04baf5ff..a03702a 100644 --- a/chrome/browser/extensions/extension_menu_manager_unittest.cc +++ b/chrome/browser/extensions/extension_menu_manager_unittest.cc @@ -7,6 +7,7 @@ #include "base/json/json_reader.h" #include "base/path_service.h" #include "base/scoped_temp_dir.h" +#include "base/scoped_vector.h" #include "base/values.h" #include "chrome/browser/extensions/extension_menu_manager.h" #include "chrome/browser/extensions/extension_message_service.h" @@ -43,11 +44,14 @@ class ExtensionMenuManagerTest : public testing::Test { // Creates and returns a test Extension. The caller does *not* own the return // value. Extension* AddExtension(std::string name) { - return prefs_.AddExtension(name); + Extension* extension = prefs_.AddExtension(name); + extensions_.push_back(extension); + return extension; } protected: ExtensionMenuManager manager_; + ScopedVector<Extension> extensions_; TestExtensionPrefs prefs_; private: diff --git a/tools/heapcheck/suppressions.txt b/tools/heapcheck/suppressions.txt index 7f3237f..abd10fd 100644 --- a/tools/heapcheck/suppressions.txt +++ b/tools/heapcheck/suppressions.txt @@ -840,12 +840,6 @@ fun:start_thread } { - bug_47471 - Heapcheck:Leak - ... - fun:ExtensionMenuManagerTest* -} -{ bug_47545 Heapcheck:Leak ... diff --git a/tools/valgrind/memcheck/suppressions.txt b/tools/valgrind/memcheck/suppressions.txt index ec4992d..b2d9a06 100644 --- a/tools/valgrind/memcheck/suppressions.txt +++ b/tools/valgrind/memcheck/suppressions.txt @@ -3593,10 +3593,3 @@ fun:_ZN9TestSuite3RunEv fun:main } - -{ - bug_47471 - Memcheck:Leak - ... - fun:*ExtensionMenuManagerTest* -} |