media: Make MediaKeys ref-counted.

media/base/android/media_source_player.h

 // Copyright (c) 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_BASE_ANDROID_MEDIA_SOURCE_PLAYER_H_
 #define MEDIA_BASE_ANDROID_MEDIA_SOURCE_PLAYER_H_
 
 #include <jni.h>
 #include <map>
 #include <string>
@@ skipping 45 matching lines @@
   void SetVolume(double volume) override;
   int GetVideoWidth() override;
   int GetVideoHeight() override;
   base::TimeDelta GetCurrentTime() override;
   base::TimeDelta GetDuration() override;
   bool IsPlaying() override;
   bool CanPause() override;
   bool CanSeekForward() override;
   bool CanSeekBackward() override;
   bool IsPlayerReady() override;
-  void SetCdm(BrowserCdm* cdm) override;
+  void SetCdm(const scoped_refptr<MediaKeys>& cdm) override;
 
   // DemuxerAndroidClient implementation.
   void OnDemuxerConfigsAvailable(const DemuxerConfigs& params) override;
   void OnDemuxerDataAvailable(const DemuxerData& params) override;
   void OnDemuxerSeekDone(base::TimeDelta actual_browser_seek_time) override;
   void OnDemuxerDurationChanged(base::TimeDelta duration) override;
 
  private:
   friend class MediaSourcePlayerTest;
 
@@ skipping 81 matching lines @@
   // Called when the demuxer config changes.
   void OnDemuxerConfigsChanged();
 
   // Called when new decryption key becomes available.
   void OnKeyAdded();
 
   // Called to resume playback after NO_KEY is received, but a new key is
   // available.
   void ResumePlaybackAfterKeyAdded();
 
-  // Called when the CDM is detached.
-  void OnCdmUnset();
-
   // Test-only method to setup hook for the completion of the next decode cycle.
   // This callback state is cleared when it is next run.
   // Prevent usage creep by only calling this from the
   // ReleaseWithOnPrefetchDoneAlreadyPosted MediaSourcePlayerTest.
   void set_decode_callback_for_testing(const base::Closure& test_decode_cb) {
     decode_callback_for_testing_ = test_decode_cb;
   }
 
   // Please keep this in sync with |kPendingEventNames| in GetEventName().
   enum PendingEventFlags {
@@ skipping 57 matching lines @@
 
   // Track the most recent preroll target. Decoder re-creation needs this to
   // resume any in-progress preroll.
   base::TimeDelta preroll_timestamp_;
 
   // A cancelable task that is posted when the audio decoder starts requesting
   // new data. This callback runs if no data arrives before the timeout period
   // elapses.
   base::CancelableClosure decoder_starvation_callback_;
 
-  MediaDrmBridge* drm_bridge_;
+  // Holds a ref-count to the CDM.
+  scoped_refptr<MediaKeys> cdm_;
+
   int cdm_registration_id_;
 
   // No decryption key available to decrypt the encrypted buffer. In this case,
   // the player should pause. When a new key is added (OnKeyAdded()), we should
   // try to start playback again.
   bool is_waiting_for_key_;
 
   // Indicates the situation where new key is added during pending decode
   // (this variable can only be set when *_decoder_job_->is_decoding()). If this
   // variable is true and MEDIA_CODEC_NO_KEY is returned then we need to try
@@ skipping 20 matching lines @@
   base::WeakPtr<MediaSourcePlayer> weak_this_;
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<MediaSourcePlayer> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaSourcePlayer);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_ANDROID_MEDIA_SOURCE_PLAYER_H_