Fixes for memory and threading issues in cast

media/cast/test/encode_decode_test.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.
 
 // Joint encoder and decoder testing.
 // These tests operate directly on the VP8 encoder and decoder, not the
 // transport layer, and are targeted at validating the bit stream.
 
 #include <gtest/gtest.h>
 
@@ skipping 55 matching lines @@
   friend class base::RefCountedThreadSafe<EncodeDecodeTestFrameCallback>;
 
   int num_called_;
   scoped_refptr<media::VideoFrame> original_frame_;
 };
 }  // namespace
 
 class EncodeDecodeTest : public ::testing::Test {
  protected:
   EncodeDecodeTest()
-      : task_runner_(new test::FakeTaskRunner(&testing_clock_)),
+      : testing_clock_(new base::SimpleTestTickClock()),
+        task_runner_(new test::FakeTaskRunner(testing_clock_)),
         // CastEnvironment will only be used by the vp8 decoder; Enable only the
         // video decoder and main threads.
-        cast_environment_(new CastEnvironment(&testing_clock_, task_runner_,
+        cast_environment_(new CastEnvironment(
+            scoped_ptr<base::TickClock>(testing_clock_).Pass(), task_runner_,
             NULL, NULL, NULL, task_runner_, NULL,
             GetDefaultCastReceiverLoggingConfig())),
         test_callback_(new EncodeDecodeTestFrameCallback()) {
-    testing_clock_.Advance(
+    testing_clock_->Advance(
         base::TimeDelta::FromMilliseconds(kStartMillisecond));
     encoder_config_.max_number_of_video_buffers_used = 1;
     encoder_config_.number_of_cores = 1;
     encoder_config_.width  = kWidth;
     encoder_config_.height  = kHeight;
     encoder_config_.start_bitrate = kStartbitrate;
     encoder_config_.min_qp = kMaxQp;
     encoder_config_.min_qp = kMinQp;
     encoder_config_.max_frame_rate = kMaxFrameRate;
     int max_unacked_frames = 1;
@@ skipping 11 matching lines @@
     video_frame_ =  media::VideoFrame::CreateFrame(VideoFrame::I420,
         size, gfx::Rect(size), size, base::TimeDelta());
     PopulateVideoFrame(video_frame_, start_value);
     test_callback_->SetFrameStartValue(start_value);
   }
 
   VideoSenderConfig encoder_config_;
   scoped_ptr<Vp8Encoder> encoder_;
   scoped_ptr<Vp8Decoder> decoder_;
   scoped_refptr<media::VideoFrame> video_frame_;
-  base::SimpleTestTickClock testing_clock_;
+  base::SimpleTestTickClock* testing_clock_;  // Owned by CastEnvironment.
   scoped_refptr<test::FakeTaskRunner> task_runner_;
   scoped_refptr<CastEnvironment> cast_environment_;
   scoped_refptr<EncodeDecodeTestFrameCallback> test_callback_;
 };
 
 TEST_F(EncodeDecodeTest, BasicEncodeDecode) {
   transport::EncodedVideoFrame encoded_frame;
   // Encode frame.
   encoder_->Encode(video_frame_, &encoded_frame);
   EXPECT_GT(encoded_frame.data.size(), GG_UINT64_C(0));
   // Decode frame.
   decoder_->Decode(&encoded_frame, base::TimeTicks(), base::Bind(
       &EncodeDecodeTestFrameCallback::DecodeComplete, test_callback_));
   task_runner_->RunTasks();
 }
 
 }  // namespace cast
 }  // namespace media