diff options
| author | vrk@google.com <vrk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-26 00:12:38 +0000 |
|---|---|---|
| committer | vrk@google.com <vrk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-26 00:12:38 +0000 |
| commit | 2c3df19adeb8872a1cc1a9e779be9cd15c55bdc9 (patch) | |
| tree | d3223ba6aa7a9c6e75de2c2992ca0eb8c73f9f4c /webkit | |
| parent | cb592c2a727cb7e9609a4b5dccf4e719ab120088 (diff) | |
| download | chromium_src-2c3df19adeb8872a1cc1a9e779be9cd15c55bdc9.zip chromium_src-2c3df19adeb8872a1cc1a9e779be9cd15c55bdc9.tar.gz chromium_src-2c3df19adeb8872a1cc1a9e779be9cd15c55bdc9.tar.bz2 | |
Fixes ReadInternal() memory leak from BufferedDataSource tests
Makes Read() calls from the loader class automatically delete the given
ReadCallback by default, so as to prevent memory leaks when a test does
not explicitly delete the ReadCallback. Also deletes valgrind and heapcheck
suppressions associated with this fix.
BUG=60381
TEST=test_shell_tests
Review URL: http://codereview.chromium.org/4116001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63817 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/glue/media/buffered_data_source_unittest.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/webkit/glue/media/buffered_data_source_unittest.cc b/webkit/glue/media/buffered_data_source_unittest.cc index 0e8d4f2..d41bbe2 100644 --- a/webkit/glue/media/buffered_data_source_unittest.cc +++ b/webkit/glue/media/buffered_data_source_unittest.cc @@ -636,6 +636,11 @@ class BufferedDataSourceTest : public testing::Test { } } + // Attach a static function that deletes the memory referred by the + // "callback" parameter. + ON_CALL(*loader_, Read(_, _, _ , _)) + .WillByDefault(DeleteArg<3>()); + StrictMock<media::MockFilterCallback> callback; EXPECT_CALL(*loader_, instance_size()) .WillRepeatedly(Return(instance_size)); |