summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-10 02:09:37 +0000
committermpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-10 02:09:37 +0000
commit558aecdf11e38aff204c39890e630cc4f561a2e3 (patch)
tree88dc7c85684bdb8921e5ad530f67520cf758311b
parent005885fb039e78e075e8c7d20a9d0a82e77f52de (diff)
downloadchromium_src-558aecdf11e38aff204c39890e630cc4f561a2e3.zip
chromium_src-558aecdf11e38aff204c39890e630cc4f561a2e3.tar.gz
chromium_src-558aecdf11e38aff204c39890e630cc4f561a2e3.tar.bz2
Fix memory leak in ExtensionWebRequestTest, and remove the suppressions for it.
BUG=85641 TEST=no Review URL: http://codereview.chromium.org/7046082 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@88625 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/extensions/extension_webrequest_api_unittest.cc3
-rw-r--r--tools/heapcheck/suppressions.txt7
-rw-r--r--tools/valgrind/memcheck/suppressions.txt7
3 files changed, 2 insertions, 15 deletions
diff --git a/chrome/browser/extensions/extension_webrequest_api_unittest.cc b/chrome/browser/extensions/extension_webrequest_api_unittest.cc
index 67ff804..5b48b10 100644
--- a/chrome/browser/extensions/extension_webrequest_api_unittest.cc
+++ b/chrome/browser/extensions/extension_webrequest_api_unittest.cc
@@ -57,7 +57,8 @@ private:
MessageLoop::current()->PostTask(FROM_HERE, task_queue_.front());
task_queue_.pop();
- return false;
+ delete message;
+ return true;
}
std::queue<Task*> task_queue_;
diff --git a/tools/heapcheck/suppressions.txt b/tools/heapcheck/suppressions.txt
index c7e5749..1735705 100644
--- a/tools/heapcheck/suppressions.txt
+++ b/tools/heapcheck/suppressions.txt
@@ -1622,10 +1622,3 @@
...
fun:WebKitContextTest_Basic_Test::TestBody
}
-{
- bug_85641
- Heapcheck:Leak
- ...
- fun:ExtensionEventRouter::DispatchEvent
- fun:ExtensionWebRequestEventRouter::DispatchEvent
-}
diff --git a/tools/valgrind/memcheck/suppressions.txt b/tools/valgrind/memcheck/suppressions.txt
index 6ea4d83..06297a9 100644
--- a/tools/valgrind/memcheck/suppressions.txt
+++ b/tools/valgrind/memcheck/suppressions.txt
@@ -4664,13 +4664,6 @@
...
fun:_ZN28WebKitContextTest_Basic_Test8TestBodyEv
}
-{
- bug_85641
- Memcheck:Leak
- fun:_Znw*
- fun:_ZN20ExtensionEventRouter13DispatchEventEPN3IPC7Message6SenderERKSsS5_S5_RK4GURL
- fun:_ZN30ExtensionWebRequestEventRouter13DispatchEventEiPN3net10URLRequestERKSt6vectorIPKNS_13EventListenerESaIS6_EERK9ListValue
-}
#-----------------------------------------------------------------------
# These only occur on our Google workstations