media: Remove SetCdmReadyCB and CdmReadyCB (part 1).

media/renderers/renderer_impl.h

 // Copyright 2014 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_RENDERERS_RENDERER_IMPL_H_
 #define MEDIA_RENDERERS_RENDERER_IMPL_H_
 
 #include <vector>
 
 #include "base/cancelable_callback.h"
@@ skipping 59 matching lines @@
   void set_time_source_for_testing(TimeSource* time_source) {
     time_source_ = time_source;
   }
   void set_video_underflow_threshold_for_testing(base::TimeDelta threshold) {
     video_underflow_threshold_ = threshold;
   }
 
  private:
   enum State {
     STATE_UNINITIALIZED,
+    STATE_INIT_PENDING_CDM,
     STATE_INITIALIZING,
     STATE_FLUSHING,
     STATE_PLAYING,
     STATE_ERROR
   };
 
   bool GetWallClockTimes(const std::vector<base::TimeDelta>& media_timestamps,
                          std::vector<base::TimeTicks>* wall_clock_times);
 
-  // Requests that this object notifies when a CDM is ready through the
-  // |cdm_ready_cb| provided.
-  // If |cdm_ready_cb| is null, the existing callback will be fired with
-  // nullptr immediately and reset.
-  void SetCdmReadyCallback(const CdmReadyCB& cdm_ready_cb);
+  bool HasEncryptedStream();
+
+  void FinishInitialization(PipelineStatus status);
 
   // Helper functions and callbacks for Initialize().
   void InitializeAudioRenderer();
   void OnAudioRendererInitializeDone(PipelineStatus status);
   void InitializeVideoRenderer();
   void OnVideoRendererInitializeDone(PipelineStatus status);
 
   // Helper functions and callbacks for Flush().
   void FlushAudioRenderer();
   void OnAudioRendererFlushDone();
@@ skipping 58 matching lines @@
   base::TimeDelta start_time_;
 
   BufferingState audio_buffering_state_;
   BufferingState video_buffering_state_;
 
   // Whether we've received the audio/video ended events.
   bool audio_ended_;
   bool video_ended_;
 
   CdmContext* cdm_context_;
-
-  // Callback registered by filters (decoder or demuxer) to be informed of a
-  // CDM.
-  // Note: We could have multiple filters registering this callback. One
-  // callback is okay because:
-  // 1, We always initialize filters in sequence.
-  // 2, Filter initialization will not finish until this callback is satisfied.
-  CdmReadyCB cdm_ready_cb_;
+  CdmAttachedCB pending_cdm_attached_cb_;
 
   bool underflow_disabled_for_testing_;
   bool clockless_video_playback_enabled_for_testing_;
 
   // Used to defer underflow for video when audio is present.
   base::CancelableClosure deferred_underflow_cb_;
 
   // The amount of time to wait before declaring underflow if the video renderer
   // runs out of data but the audio renderer still has enough.
   base::TimeDelta video_underflow_threshold_;
 
   base::WeakPtr<RendererImpl> weak_this_;
   base::WeakPtrFactory<RendererImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(RendererImpl);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_RENDERERS_RENDERER_IMPL_H_