Pass initDataType instead of contentType on OnNeedKey().

content/renderer/media/crypto/encrypted_media_player_support_impl.cc

 // 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.
 
 #include "content/renderer/media/crypto/encrypted_media_player_support_impl.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
@@ skipping 97 matching lines @@
                                          const std::string& key_system,
                                          WebMediaPlayer::MediaKeyException e) {
   MediaKeyException result_id = MediaKeyExceptionForUMA(e);
   DCHECK_NE(result_id, kUnknownResultId) << e;
   EmeUMAHistogramEnumeration(
       key_system, method, result_id, kMaxMediaKeyException);
 }
 
 // Guess the type of |init_data|. This is only used to handle some corner cases
 // so we keep it as simple as possible without breaking major use cases.
 static std::string GuessInitDataType(const unsigned char* init_data,

[ddorwin, 2014/09/26 22:09:18]

Fix WMPA too.

[sandersd (OOO until July 31), 2014/09/26 22:49:56]

Done.

                                      unsigned init_data_length) {
-  // Most WebM files use KeyId of 16 bytes. MP4 init data are always >16 bytes.
+  // Most WebM files use KeyId of 16 bytes. CENC init data is always >16 bytes.
   if (init_data_length == 16)
-    return "video/webm";
+    return "webm";
 
-  return "video/mp4";
+  return "cenc";
 }
 
 scoped_ptr<media::EncryptedMediaPlayerSupport>
 EncryptedMediaPlayerSupportImpl::Create(blink::WebMediaPlayerClient* client) {
   return scoped_ptr<EncryptedMediaPlayerSupport>(
       new EncryptedMediaPlayerSupportImpl(client));
 }
 
 EncryptedMediaPlayerSupportImpl::EncryptedMediaPlayerSupportImpl(
     blink::WebMediaPlayerClient* client)
@@ skipping 64 matching lines @@
     return WebMediaPlayer::MediaKeyExceptionInvalidPlayerState;
   }
 
   std::string init_data_type = init_data_type_;
   if (init_data_type.empty())
     init_data_type = GuessInitDataType(init_data, init_data_length);
 
   // TODO(xhwang): We assume all streams are from the same container (thus have
   // the same "type") for now. In the future, the "type" should be passed down
   // from the application.
   if (!proxy_decryptor_->GenerateKeyRequest(

[ddorwin, 2014/09/26 22:09:18]

You need to fix this this function too - remove the conversion.
https://code.google.com/p/chromium/codesearch#chromium/src/content/renderer/m...

[sandersd (OOO until July 31), 2014/09/26 22:49:56]

Done.

            init_data_type, init_data, init_data_length)) {
     current_key_system_.clear();
     return WebMediaPlayer::MediaKeyExceptionKeySystemNotSupported;
   }
 
   return WebMediaPlayer::MediaKeyExceptionNoError;
 }
 
 WebMediaPlayer::MediaKeyException EncryptedMediaPlayerSupportImpl::AddKey(
     const WebString& key_system,
@@ skipping 243 matching lines @@
 
   if (web_cdm_) {
     decryptor_ready_cb.Run(web_cdm_->GetDecryptor(), base::Bind(DoNothing));
     return;
   }
 
   decryptor_ready_cb_ = decryptor_ready_cb;
 }
 
 }  // namespace content