summaryrefslogtreecommitdiffstats
path: root/webkit/glue/media
diff options
context:
space:
mode:
authorvrk@google.com <vrk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-22 23:16:55 +0000
committervrk@google.com <vrk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-22 23:16:55 +0000
commit9fe9ec2e360b0c61bbdb134fc63cc4fc5af36da1 (patch)
tree8a8768aa77e43ed5285b90dd4313a3dfb1010c4c /webkit/glue/media
parentc2bffcd9ab592054519bdab5c38849bfa6af21a2 (diff)
downloadchromium_src-9fe9ec2e360b0c61bbdb134fc63cc4fc5af36da1.zip
chromium_src-9fe9ec2e360b0c61bbdb134fc63cc4fc5af36da1.tar.gz
chromium_src-9fe9ec2e360b0c61bbdb134fc63cc4fc5af36da1.tar.bz2
Fixing valgrind error because of mem leak in BuffereDataSource unit tests
Forgot to stop the DataSource at the end of the ReadHang test. BUG=NONE TEST=test_shell_tests Review URL: http://codereview.chromium.org/4059002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63592 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/media')
-rw-r--r--webkit/glue/media/buffered_data_source_unittest.cc5
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 b78f759..25e5192 100644
--- a/webkit/glue/media/buffered_data_source_unittest.cc
+++ b/webkit/glue/media/buffered_data_source_unittest.cc
@@ -772,6 +772,10 @@ class BufferedDataSourceTest : public testing::Test {
EXPECT_CALL(*loader_, Stop());
data_source_->Abort();
message_loop_->RunAllPending();
+
+ // The loader has now been stopped. Set this to null so that when the
+ // DataSource is stopped, it does not expect a call to stop the loader.
+ loader_ = NULL;
}
void ReadDataSourceMiss(int64 position, int size) {
@@ -966,6 +970,7 @@ TEST_F(BufferedDataSourceTest, ReadCacheMiss) {
TEST_F(BufferedDataSourceTest, ReadHang) {
InitializeDataSource(kHttpUrl, net::OK, true, 25, LOADING);
ReadDataSourceHang(10, 10);
+ StopDataSource();
}
TEST_F(BufferedDataSourceTest, ReadFailed) {