Fixes for memory and threading issues in cast

media/cast/cast_environment.h

 // 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.
 
 #ifndef MEDIA_CAST_CAST_ENVIRONMENT_H_
 #define MEDIA_CAST_CAST_ENVIRONMENT_H_
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 20 matching lines @@
     // done, primarily decoding but also error concealment and re-sampling.
     AUDIO_DECODER,
     // The video encoder thread is where the video encode processing is done.
     VIDEO_ENCODER,
     // The video decoder thread is where the video decode processing is done.
     VIDEO_DECODER,
      // The transport thread is where the transport processing is done.
     TRANSPORT,
   };
 
-  CastEnvironment(base::TickClock* clock,
+  CastEnvironment(scoped_ptr<base::TickClock> clock,
                   scoped_refptr<base::TaskRunner> main_thread_proxy,
                   scoped_refptr<base::TaskRunner> audio_encode_thread_proxy,
                   scoped_refptr<base::TaskRunner> audio_decode_thread_proxy,
                   scoped_refptr<base::TaskRunner> video_encode_thread_proxy,
                   scoped_refptr<base::TaskRunner> video_decode_thread_proxy,
                   scoped_refptr<base::TaskRunner> transport_thread_proxy,
                   const CastLoggingConfig& config);
 
   // These are the same methods in message_loop.h, but are guaranteed to either
   // get posted to the MessageLoop if it's still alive, or be deleted otherwise.
@@ skipping 18 matching lines @@
 
   scoped_refptr<base::TaskRunner> GetMessageTaskRunnerForThread(
       ThreadId identifier);
 
  protected:
   virtual ~CastEnvironment();
 
  private:
   friend class base::RefCountedThreadSafe<CastEnvironment>;
 
-  base::TickClock* const clock_;  // Not owned by this class.
+  scoped_ptr<base::TickClock> clock_;
   scoped_refptr<base::TaskRunner> main_thread_proxy_;
   scoped_refptr<base::TaskRunner> audio_encode_thread_proxy_;
   scoped_refptr<base::TaskRunner> audio_decode_thread_proxy_;
   scoped_refptr<base::TaskRunner> video_encode_thread_proxy_;
   scoped_refptr<base::TaskRunner> video_decode_thread_proxy_;
   scoped_refptr<base::TaskRunner> transport_thread_proxy_;
 
   scoped_ptr<LoggingImpl> logging_;
 
   DISALLOW_COPY_AND_ASSIGN(CastEnvironment);
 };
 
 }  // namespace cast
 }  // namespace media
 
 #endif  // MEDIA_CAST_CAST_ENVIRONMENT_H_