Pass initial CDM to CreateMediaPlayer()

media/blink/null_encrypted_media_player_support.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_BLINK_NULL_ENCRYPTED_MEDIA_PLAYER_SUPPORT_H_
 #define MEDIA_BLINK_NULL_ENCRYPTED_MEDIA_PLAYER_SUPPORT_H_
 
 #include "media/base/media_export.h"
 #include "media/blink/encrypted_media_player_support.h"
 
@@ skipping 24 matching lines @@
       const unsigned char* init_data,
       unsigned init_data_length,
       const blink::WebString& session_id) OVERRIDE;
 
   virtual blink::WebMediaPlayer::MediaKeyException CancelKeyRequest(
       const blink::WebString& key_system,
       const blink::WebString& session_id) OVERRIDE;
 
 
   // Unprefixed API methods.
+  virtual void SetInitialContentDecryptionModule(
+      blink::WebContentDecryptionModule* cdm) OVERRIDE;
+

[ddorwin, 2014/09/23 18:03:23]

remove empty line

[jrummell, 2014/09/23 20:01:38]

Done.

   virtual void SetContentDecryptionModule(
       blink::WebContentDecryptionModule* cdm) OVERRIDE;
   virtual void SetContentDecryptionModule(
       blink::WebContentDecryptionModule* cdm,
       blink::WebContentDecryptionModuleResult result) OVERRIDE;
-  virtual void SetContentDecryptionModuleSync(
-      blink::WebContentDecryptionModule* cdm) OVERRIDE;
 
 
   // Callback factory and notification methods used by WebMediaPlayerImpl.
 
   // Creates a callback that Demuxers can use to signal that the content
   // requires a key. This method makes sure the callback returned can be safely
   // invoked from any thread.
   virtual Demuxer::NeedKeyCB CreateNeedKeyCB() OVERRIDE;
 
   // Creates a callback that renderers can use to set decryptor
   // ready callback. This method makes sure the callback returned can be safely
   // invoked from any thread.
   virtual SetDecryptorReadyCB CreateSetDecryptorReadyCB() OVERRIDE;
 
   // Called to inform this object that the media pipeline encountered
   // and handled a decryption error.
   virtual void OnPipelineDecryptError() OVERRIDE;
 
  private:
   NullEncryptedMediaPlayerSupport();
 
   DISALLOW_COPY_AND_ASSIGN(NullEncryptedMediaPlayerSupport);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BLINK_NULL_ENCRYPTED_MEDIA_PLAYER_SUPPORT_H_