Fixes for memory and threading issues in cast

media/cast/audio_receiver/audio_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/test/simple_test_tick_clock.h"
 #include "media/cast/audio_receiver/audio_decoder.h"
 #include "media/cast/cast_environment.h"
 #include "media/cast/test/fake_task_runner.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace media {
 namespace cast {
 
 namespace {
 class TestRtpPayloadFeedback : public RtpPayloadFeedback {
  public:
   TestRtpPayloadFeedback() {}
   virtual ~TestRtpPayloadFeedback() {}
 
   virtual void CastFeedback(const RtcpCastMessage& cast_feedback) OVERRIDE {
     EXPECT_EQ(1u, cast_feedback.ack_frame_id_);
     EXPECT_EQ(0u, cast_feedback.missing_frames_and_packets_.size());
   }
 };
 }  // namespace.
 
 class AudioDecoderTest : public ::testing::Test {
  protected:
   AudioDecoderTest() {
-    testing_clock_.Advance(base::TimeDelta::FromMilliseconds(1234));
-    task_runner_ = new test::FakeTaskRunner(&testing_clock_);
-    cast_environment_ = new CastEnvironment(&testing_clock_, task_runner_,
+    testing_clock_ = new base::SimpleTestTickClock();
+    testing_clock_->Advance(base::TimeDelta::FromMilliseconds(1234));
+    task_runner_ = new test::FakeTaskRunner(testing_clock_);
+    cast_environment_ = new CastEnvironment(
+        scoped_ptr<base::TickClock>(testing_clock_).Pass(), task_runner_,
         task_runner_, task_runner_, task_runner_, task_runner_, task_runner_,
         GetDefaultCastReceiverLoggingConfig());
   }
   virtual ~AudioDecoderTest() {}
 
   void Configure(const AudioReceiverConfig& audio_config) {
     audio_decoder_.reset(
         new AudioDecoder(cast_environment_, audio_config, &cast_feedback_));
   }
 
   TestRtpPayloadFeedback cast_feedback_;
-  base::SimpleTestTickClock testing_clock_;
+  // Owned by CastEnvironment.
+  base::SimpleTestTickClock* testing_clock_;
   scoped_refptr<test::FakeTaskRunner> task_runner_;
   scoped_refptr<CastEnvironment> cast_environment_;
   scoped_ptr<AudioDecoder> audio_decoder_;
 };
 
 TEST_F(AudioDecoderTest, Pcm16MonoNoResampleOnePacket) {
   AudioReceiverConfig audio_config;
   audio_config.rtp_payload_type = 127;
   audio_config.frequency = 16000;
   audio_config.channels = 1;
@@ skipping 100 matching lines @@
                                                &audio_frame,
                                                &rtp_timestamp));
   EXPECT_EQ(2, audio_frame.channels);
   EXPECT_EQ(16000, audio_frame.frequency);
   EXPECT_EQ(640ul, audio_frame.samples.size());
   for (size_t i = 0; i < audio_frame.samples.size(); ++i) {
     EXPECT_NEAR(0x3412, audio_frame.samples[i], 1000);
   }
   // Test cast callback.
   audio_decoder_->SendCastMessage();
-  testing_clock_.Advance(base::TimeDelta::FromMilliseconds(33));
+  testing_clock_->Advance(base::TimeDelta::FromMilliseconds(33));
   audio_decoder_->SendCastMessage();
 }
 
 TEST_F(AudioDecoderTest, Pcm16Resample) {
   AudioReceiverConfig audio_config;
   audio_config.rtp_payload_type = 127;
   audio_config.frequency = 16000;
   audio_config.channels = 2;
   audio_config.codec = transport::kPcm16;
   audio_config.use_external_decoder = false;
@@ skipping 35 matching lines @@
   // Resampling makes the variance worse.
   for (size_t i = 100 * audio_config.channels; i < audio_frame.samples.size();
       ++i) {
     EXPECT_NEAR(0x3412, audio_frame.samples[i], 400);
     if (0x3412 == audio_frame.samples[i])  count++;
   }
 }
 
 }  // namespace cast
 }  // namespace media