summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-04 23:35:33 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-04 23:35:33 +0000
commitd7a026cbb7cea2a3f55083f167fe222a6d96ade4 (patch)
treefbb7dc0b01804ff5fff2cbc90a58eb5abf706db6 /webkit
parent7a9b0ba5648b9ea893f4f49dc332f3011ebee2d9 (diff)
downloadchromium_src-d7a026cbb7cea2a3f55083f167fe222a6d96ade4.zip
chromium_src-d7a026cbb7cea2a3f55083f167fe222a6d96ade4.tar.gz
chromium_src-d7a026cbb7cea2a3f55083f167fe222a6d96ade4.tar.bz2
Mark some more release() calls with ignore_result.
BUG=42904 TEST=none Review URL: http://codereview.chromium.org/1695033 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46411 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/glue/media/buffered_data_source_unittest.cc15
-rw-r--r--webkit/glue/media/simple_data_source_unittest.cc4
2 files changed, 8 insertions, 11 deletions
diff --git a/webkit/glue/media/buffered_data_source_unittest.cc b/webkit/glue/media/buffered_data_source_unittest.cc
index f20d1c1..13e40f9 100644
--- a/webkit/glue/media/buffered_data_source_unittest.cc
+++ b/webkit/glue/media/buffered_data_source_unittest.cc
@@ -135,7 +135,7 @@ class BufferedResourceLoaderTest : public testing::Test {
}
void ReleaseBridge() {
- bridge_.release();
+ ignore_result(bridge_.release());
}
// Helper method to write to |loader_| from |data_|.
@@ -428,10 +428,10 @@ class MockBufferedDataSource : public BufferedDataSource {
class BufferedDataSourceTest : public testing::Test {
public:
BufferedDataSourceTest() {
- message_loop_.reset(MessageLoop::current());
+ message_loop_ = MessageLoop::current();
bridge_factory_.reset(
new StrictMock<MockMediaResourceLoaderBridgeFactory>());
- factory_ = MockBufferedDataSource::CreateFactory(message_loop_.get(),
+ factory_ = MockBufferedDataSource::CreateFactory(message_loop_,
bridge_factory_.get());
// Prepare test data.
@@ -448,9 +448,6 @@ class BufferedDataSourceTest : public testing::Test {
.WillOnce(Invoke(this,
&BufferedDataSourceTest::ReleaseBridgeFactory));
}
-
- // We don't own the message loop so release it.
- message_loop_.release();
}
void InitializeDataSource(const char* url, int error,
@@ -542,7 +539,7 @@ class BufferedDataSourceTest : public testing::Test {
}
void ReleaseBridgeFactory() {
- bridge_factory_.release();
+ ignore_result(bridge_factory_.release());
}
void InvokeStartCallback(
@@ -683,7 +680,7 @@ class BufferedDataSourceTest : public testing::Test {
.WillOnce(DoAll(Assign(&error_, size),
Invoke(this,
&BufferedDataSourceTest::InvokeReadCallback),
- InvokeWithoutArgs(message_loop_.get(),
+ InvokeWithoutArgs(message_loop_,
&MessageLoop::Quit)));
EXPECT_CALL(*this, ReadCallback(size));
@@ -712,7 +709,7 @@ class BufferedDataSourceTest : public testing::Test {
StrictMock<media::MockFilterHost> host_;
GURL gurl_;
- scoped_ptr<MessageLoop> message_loop_;
+ MessageLoop* message_loop_;
int error_;
uint8 buffer_[1024];
diff --git a/webkit/glue/media/simple_data_source_unittest.cc b/webkit/glue/media/simple_data_source_unittest.cc
index 86f4439..c43cbc9 100644
--- a/webkit/glue/media/simple_data_source_unittest.cc
+++ b/webkit/glue/media/simple_data_source_unittest.cc
@@ -151,11 +151,11 @@ class SimpleDataSourceTest : public testing::Test {
}
void ReleaseBridge() {
- bridge_.release();
+ ignore_result(bridge_.release());
}
void ReleaseBridgeFactory() {
- bridge_factory_.release();
+ ignore_result(bridge_factory_.release());
}
MOCK_METHOD1(ReadCallback, void(size_t size));