summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/common/extensions/extension_unittest.cc4
-rw-r--r--tools/valgrind/memcheck/suppressions.txt8
2 files changed, 2 insertions, 10 deletions
diff --git a/chrome/common/extensions/extension_unittest.cc b/chrome/common/extensions/extension_unittest.cc
index fb05f7f..6e1ad5e 100644
--- a/chrome/common/extensions/extension_unittest.cc
+++ b/chrome/common/extensions/extension_unittest.cc
@@ -302,8 +302,8 @@ TEST(ExtensionTest, LoadPageActionHelper) {
DictionaryValue input;
// First try with an empty dictionary.
- ASSERT_TRUE(extension.LoadExtensionActionHelper(
- &input, &error_msg) != NULL);
+ action.reset(extension.LoadExtensionActionHelper(&input, &error_msg));
+ ASSERT_TRUE(action != NULL);
ASSERT_STREQ("", error_msg.c_str());
error_msg = "";
diff --git a/tools/valgrind/memcheck/suppressions.txt b/tools/valgrind/memcheck/suppressions.txt
index 6d6b210..36f2ac6 100644
--- a/tools/valgrind/memcheck/suppressions.txt
+++ b/tools/valgrind/memcheck/suppressions.txt
@@ -1059,14 +1059,6 @@
fun:_ZN7WebCore9CSSParser10parseSheetEPNS_13CSSStyleSheetERKNS_6StringE
}
{
- bug_26216
- Memcheck:Leak
- fun:_Znw*
- ...
- fun:_ZN9Extension25LoadExtensionActionHelperEPK15DictionaryValuePSs
- fun:_ZN39ExtensionTest_LoadPageActionHelper_Test8TestBodyEv
-}
-{
bug_26966
Memcheck:Leak
fun:malloc