Remove VideoDecodeAccelerator::SetCdm() and pass the cdm in Initialize()

media/gpu/android_video_decode_accelerator.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_GPU_ANDROID_VIDEO_DECODE_ACCELERATOR_H_
 #define MEDIA_GPU_ANDROID_VIDEO_DECODE_ACCELERATOR_H_
 
 #include <stdint.h>
 
 #include <list>
@@ skipping 105 matching lines @@
   };
 
   AndroidVideoDecodeAccelerator(
       const MakeGLContextCurrentCallback& make_context_current_cb,
       const GetGLES2DecoderCallback& get_gles2_decoder_cb);
 
   ~AndroidVideoDecodeAccelerator() override;
 
   // media::VideoDecodeAccelerator implementation:
   bool Initialize(const Config& config, Client* client) override;
-  void SetCdm(int cdm_id) override;
   void Decode(const media::BitstreamBuffer& bitstream_buffer) override;
   void AssignPictureBuffers(
       const std::vector<media::PictureBuffer>& buffers) override;
   void ReusePictureBuffer(int32_t picture_buffer_id) override;
   void Flush() override;
   void Reset() override;
   void Destroy() override;
   bool TryToSetupDecodeOnSeparateThread(
       const base::WeakPtr<Client>& decode_client,
       const scoped_refptr<base::SingleThreadTaskRunner>& decode_task_runner)
@@ skipping 115 matching lines @@
   // more output.
   bool DequeueOutput();
 
   // Requests picture buffers from the client.
   void RequestPictureBuffers();
 
   // Decode the content in the |bitstream_buffer|. Note that a
   // |bitstream_buffer| of id as -1 indicates a flush command.
   void DecodeBuffer(const media::BitstreamBuffer& bitstream_buffer);
 
-  // This callback is called after CDM obtained a MediaCrypto object.
+  // Called during Initialize() for encrypted streams to set up the CDM.
+  void InitializeCdm(int cdm_id);
+
+  // Called after the CDM obtains a MediaCrypto object.
   void OnMediaCryptoReady(
       media::MediaDrmBridgeCdmContext::JavaObjectPtr media_crypto,
       bool needs_protected_surface);
 
-  // This callback is called when a new key is added to CDM.
+  // Called when a new key is added to the CDM.
   void OnKeyAdded();
 
   // Notifies the client of the result of deferred initialization.
   void NotifyInitializationComplete(bool success);
 
   // Notifies the client about the availability of a picture.
   void NotifyPictureReady(const media::Picture& picture);
 
   // Notifies the client that the input buffer identifed by input_buffer_id has
   // been processed.
@@ skipping 101 matching lines @@
   class OnFrameAvailableHandler;
   scoped_refptr<OnFrameAvailableHandler> on_frame_available_handler_;
 
   // Time at which we last did useful work on io_timer_.
   base::TimeTicks most_recent_work_;
 
   // Type of a drain request. We need to distinguish between DRAIN_FOR_FLUSH
   // and other types, see IsDrainingForResetOrDestroy().
   DrainType drain_type_;
 
-  // CDM related stuff.
-
   // Holds a ref-count to the CDM to avoid using the CDM after it's destroyed.
   scoped_refptr<media::MediaKeys> cdm_for_reference_holding_only_;
 
   media::MediaDrmBridgeCdmContext* media_drm_bridge_cdm_context_;
 
   // MediaDrmBridge requires registration/unregistration of the player, this
   // registration id is used for this.
   int cdm_registration_id_;
 
   // Configuration that we use for MediaCodec.
@@ skipping 17 matching lines @@
 
   // WeakPtrFactory for posting tasks back to |this|.
   base::WeakPtrFactory<AndroidVideoDecodeAccelerator> weak_this_factory_;
 
   friend class AndroidVideoDecodeAcceleratorTest;
 };
 
 }  // namespace media
 
 #endif  // MEDIA_GPU_ANDROID_VIDEO_DECODE_ACCELERATOR_H_