Fixes for memory and threading issues in cast

media/cast/video_receiver/video_decoder_unittest.cc

 // Copyright 2013 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 "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/test/simple_test_tick_clock.h"
 #include "base/time/tick_clock.h"
 #include "media/cast/cast_config.h"
 #include "media/cast/cast_defines.h"
@@ skipping 22 matching lines @@
  protected:
   virtual ~DecodeTestFrameCallback() {}
  private:
   friend class base::RefCountedThreadSafe<DecodeTestFrameCallback>;
 };
 }  // namespace
 
 class VideoDecoderTest : public ::testing::Test {
  protected:
   VideoDecoderTest()
-    : task_runner_(new test::FakeTaskRunner(&testing_clock_)),
-      cast_environment_(new CastEnvironment(&testing_clock_, task_runner_,
-          task_runner_, task_runner_, task_runner_, task_runner_,
-          task_runner_, GetDefaultCastReceiverLoggingConfig())),
-      test_callback_(new DecodeTestFrameCallback()) {
+      : testing_clock_(new base::SimpleTestTickClock()),
+        task_runner_(new test::FakeTaskRunner(testing_clock_)),
+        cast_environment_(new CastEnvironment(
+            scoped_ptr<base::TickClock>(testing_clock_), task_runner_,
+            task_runner_, task_runner_, task_runner_, task_runner_,
+            task_runner_, GetDefaultCastReceiverLoggingConfig())),
+        test_callback_(new DecodeTestFrameCallback()) {
     // Configure to vp8.
     config_.codec = transport::kVp8;
     config_.use_external_decoder = false;
     decoder_.reset(new VideoDecoder(config_, cast_environment_));
-    testing_clock_.Advance(
+    testing_clock_->Advance(
         base::TimeDelta::FromMilliseconds(kStartMillisecond));
   }
 
   virtual ~VideoDecoderTest() {}
 
   scoped_ptr<VideoDecoder> decoder_;
   VideoReceiverConfig config_;
-  base::SimpleTestTickClock testing_clock_;
+  base::SimpleTestTickClock* testing_clock_;  // Owned by CastEnvironment.
   scoped_refptr<test::FakeTaskRunner> task_runner_;
   scoped_refptr<CastEnvironment> cast_environment_;
   scoped_refptr<DecodeTestFrameCallback> test_callback_;
 };
 
 // TODO(pwestin): EXPECT_DEATH tests can not pass valgrind.
 TEST_F(VideoDecoderTest, DISABLED_SizeZero) {
   transport::EncodedVideoFrame encoded_frame;
   base::TimeTicks render_time;
   encoded_frame.codec = transport::kVp8;
   EXPECT_DEATH(
       decoder_->DecodeVideoFrame(
           &encoded_frame, render_time,
           base::Bind(&DecodeTestFrameCallback::DecodeComplete, test_callback_)),
       "Empty frame");
 }
 
 // TODO(pwestin): Test decoding a real frame.
 
 }  // namespace cast
 }  // namespace media