Fixes for memory and threading issues in cast

media/cast/cast_environment.h

Index: media/cast/cast_environment.h
diff --git a/media/cast/cast_environment.h b/media/cast/cast_environment.h
index 31e4f50f1caa3285ed3347b2e6e5ab9ca61bf524..f7f9b7e210701e2ae6414e1a2cf4e43ecb1fe031 100644
--- a/media/cast/cast_environment.h
+++ b/media/cast/cast_environment.h
@@ -38,7 +38,7 @@ class CastEnvironment : public base::RefCountedThreadSafe<CastEnvironment> {
     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,
@@ -77,7 +77,7 @@ class CastEnvironment : public base::RefCountedThreadSafe<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_;