Fix Valgrind warnings from r105646.

media/filters/ffmpeg_demuxer_unittest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <deque>
 
 #include "base/file_path.h"
 #include "base/path_service.h"
 #include "base/threading/thread.h"
 #include "media/base/filters.h"
@@ skipping 18 matching lines @@
 using ::testing::WithArgs;
 using ::testing::_;
 
 namespace media {
 
 MATCHER(IsEndOfStreamBuffer,
         std::string(negation ? "isn't" : "is") + " end of stream") {
   return arg->IsEndOfStream();
 }
 
+ACTION(DeleteArg0Buffer) {
+  scoped_refptr<Buffer> buffer(arg0);
+}
+
 // Fixture class to facilitate writing tests.  Takes care of setting up the
 // FFmpeg, pipeline and filter host mocks.
 class FFmpegDemuxerTest : public testing::Test {
  protected:
 
   FFmpegDemuxerTest() {
     // Create an FFmpegDemuxer.
     demuxer_ = new FFmpegDemuxer(&message_loop_);
     demuxer_->disable_first_seek_hack_for_testing();
 
@@ skipping 347 matching lines @@
 
   // Expect all calls in sequence.
   InSequence s;
 
   // Create our mocked callback. The Callback created by base::Bind() will take
   // ownership of this pointer.
   StrictMock<MockReadCallback>* callback = new StrictMock<MockReadCallback>();
 
   // The callback should be immediately deleted.  We'll use a checkpoint to
   // verify that it has indeed been deleted.
-  EXPECT_CALL(*callback, Run(NotNull()));
+  EXPECT_CALL(*callback, Run(IsEndOfStreamBuffer()))

[scherkus (not reviewing), 2011/10/17 17:59:18]

Woah -- we shouldn't have to do this considering it's a ref-counted object!

Can you change the callees to do the following:

scoped_refptr<Buffer> eos = new DataBuffer(0);
Run(eos);

+      .WillOnce(DeleteArg0Buffer());
   EXPECT_CALL(*callback, OnDelete());
   EXPECT_CALL(*this, CheckPoint(1));
 
   // Attempt the read...
   audio->Read(base::Bind(&MockReadCallback::Run, callback));
 
   message_loop_.RunAllPending();
 
   // ...and verify that |callback| was deleted.
   CheckPoint(1);
@@ skipping 18 matching lines @@
 
   // Expect all calls in sequence.
   InSequence s;
 
   // Create our mocked callback. The Callback created by base::Bind() will take
   // ownership of this pointer.
   StrictMock<MockReadCallback>* callback = new StrictMock<MockReadCallback>();
 
   // The callback should be immediately deleted.  We'll use a checkpoint to
   // verify that it has indeed been deleted.
-  EXPECT_CALL(*callback, Run(IsEndOfStreamBuffer()));
+  EXPECT_CALL(*callback, Run(IsEndOfStreamBuffer()))
+      .WillOnce(DeleteArg0Buffer());
   EXPECT_CALL(*callback, OnDelete());
   EXPECT_CALL(*this, CheckPoint(1));
 
   // Release the reference to the demuxer. This should also destroy it.
   demuxer_ = NULL;
   // |audio| now has a demuxer_ pointer to invalid memory.
 
   // Attempt the read...
   audio->Read(base::Bind(&MockReadCallback::Run, callback));
 
@@ skipping 227 matching lines @@
   message_loop_.RunAllPending();
   EXPECT_TRUE(reader->called());
   ValidateBuffer(FROM_HERE, reader->buffer(), 1740, 2436000);
 
   // Manually release the last reference to the buffer and verify it was freed.
   reader->Reset();
   message_loop_.RunAllPending();
 }
 
 }  // namespace media