Move OnNeedKey() to WebMediaPlayerImpl.

content/renderer/media/android/webmediaplayer_android.cc

 // Copyright 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.
 
 #include "content/renderer/media/android/webmediaplayer_android.h"
 
 #include <limits>
 
 #include "base/android/build_info.h"
 #include "base/bind.h"
@@ skipping 1713 matching lines @@
       message.empty() ? NULL : &message[0],
       message.size(),
       destination_url);
 }
 
 void WebMediaPlayerAndroid::OnMediaSourceOpened(
     blink::WebMediaSource* web_media_source) {
   client_->mediaSourceOpened(web_media_source);
 }
 
-void WebMediaPlayerAndroid::OnNeedKey(const std::string& type,
+void WebMediaPlayerAndroid::OnNeedKey(const std::string& init_data_type,
                                       const std::vector<uint8>& init_data) {
   DCHECK(main_thread_checker_.CalledOnValidThread());
 
   // Do not fire NeedKey event if encrypted media is not enabled.
   if (!blink::WebRuntimeFeatures::isPrefixedEncryptedMediaEnabled() &&
       !blink::WebRuntimeFeatures::isEncryptedMediaEnabled()) {
     return;
   }
 
   UMA_HISTOGRAM_COUNTS(kMediaEme + std::string("NeedKey"), 1);
 
-  DCHECK(init_data_type_.empty() || type.empty() || type == init_data_type_);
+  DCHECK(init_data_type_.empty() || init_data_type.empty() ||

[ddorwin, 2014/12/02 22:06:38]

We should log instead of check here too.

[xhwang, 2014/12/02 22:31:27]

Done.

+         init_data_type == init_data_type_);
   if (init_data_type_.empty())
-    init_data_type_ = type;
+    init_data_type_ = init_data_type;
 
   const uint8* init_data_ptr = init_data.empty() ? NULL : &init_data[0];
   client_->encrypted(
-      WebString::fromUTF8(type), init_data_ptr, init_data.size());
+      WebString::fromUTF8(init_data_type), init_data_ptr, init_data.size());
 }
 
 void WebMediaPlayerAndroid::SetDecryptorReadyCB(
     const media::DecryptorReadyCB& decryptor_ready_cb) {
   DCHECK(main_thread_checker_.CalledOnValidThread());
 
   // Cancels the previous decryptor request.
   if (decryptor_ready_cb.is_null()) {
     if (!decryptor_ready_cb_.is_null()) {
       base::ResetAndReturn(&decryptor_ready_cb_)
@@ skipping 26 matching lines @@
 
 bool WebMediaPlayerAndroid::IsHLSStream() const {
   std::string mime;
   GURL url = redirected_url_.is_empty() ? url_ : redirected_url_;
   if (!net::GetMimeTypeFromFile(base::FilePath(url.path()), &mime))
     return false;
   return !mime.compare("application/x-mpegurl");
 }
 
 }  // namespace content