Fixes memory leak in media_mojo_shell_unittests.

media/mojo/services/media_mojo_unittest.cc

 // Copyright 2015 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 <stdint.h>
 
 #include <memory>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 41 matching lines @@
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockRendererClient);
 };
 
 class MediaShellTest : public shell::test::ShellTest {
  public:
   MediaShellTest()
       : ShellTest("exe:media_mojo_unittests"),
         renderer_client_binding_(&renderer_client_),
-        video_demuxer_stream_(DemuxerStream::VIDEO) {}
+        video_stream_(DemuxerStream::VIDEO) {}
   ~MediaShellTest() override {}
 
   void SetUp() override {
     ShellTest::SetUp();
 
     connection_ = connector()->Connect("mojo:media");
     connection_->SetConnectionLostClosure(
         base::Bind(&MediaShellTest::ConnectionClosed, base::Unretained(this)));
 
     connection_->GetInterface(&service_factory_);
@@ skipping 22 matching lines @@
         key_system, kSecurityOrigin, mojom::CdmConfig::From(CdmConfig()),
         base::Bind(&MediaShellTest::OnCdmInitialized, base::Unretained(this)));
   }
 
   MOCK_METHOD1(OnRendererInitialized, void(bool));
 
   void InitializeRenderer(const VideoDecoderConfig& video_config,
                           bool expected_result) {
     service_factory_->CreateRenderer(mojo::GetProxy(&renderer_));
 
-    video_demuxer_stream_.set_video_decoder_config(video_config);
+    video_stream_.set_video_decoder_config(video_config);
 
-    mojom::DemuxerStreamPtr video_stream;
-    new MojoDemuxerStreamImpl(&video_demuxer_stream_, GetProxy(&video_stream));
+    mojom::DemuxerStreamPtr video_stream_proxy;
+    mojo_video_stream_.reset(new MojoDemuxerStreamImpl(
+        &video_stream_, GetProxy(&video_stream_proxy)));
 
     EXPECT_CALL(*this, OnRendererInitialized(expected_result))
         .Times(Exactly(1))
         .WillOnce(InvokeWithoutArgs(run_loop_.get(), &base::RunLoop::Quit));
     renderer_->Initialize(renderer_client_binding_.CreateInterfacePtrAndBind(),
-                          nullptr, std::move(video_stream),
+                          nullptr, std::move(video_stream_proxy),
                           base::Bind(&MediaShellTest::OnRendererInitialized,
                                      base::Unretained(this)));
   }
 
   MOCK_METHOD0(ConnectionClosed, void());
 
  protected:
   std::unique_ptr<base::RunLoop> run_loop_;
 
   mojom::ServiceFactoryPtr service_factory_;
   mojom::ContentDecryptionModulePtr cdm_;
   mojom::RendererPtr renderer_;
 
   StrictMock<MockRendererClient> renderer_client_;
   mojo::Binding<mojom::RendererClient> renderer_client_binding_;
 
-  StrictMock<MockDemuxerStream> video_demuxer_stream_;
+  StrictMock<MockDemuxerStream> video_stream_;
+  std::unique_ptr<MojoDemuxerStreamImpl> mojo_video_stream_;
 
  private:
   std::unique_ptr<shell::Connection> connection_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaShellTest);
 };
 
 }  // namespace
 
 // Note: base::RunLoop::RunUntilIdle() does not work well in these tests because
@@ skipping 39 matching lines @@
   // close the connection.
   EXPECT_CALL(*this, ConnectionClosed())
       .Times(Exactly(1))
       .WillOnce(Invoke(run_loop_.get(), &base::RunLoop::Quit));
   service_factory_.reset();
 
   run_loop_->Run();
 }
 
 }  // namespace media