Rename keyNeeded() to encrypted() in Chromium.

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 354 matching lines @@
 
 media::Demuxer::NeedKeyCB
 EncryptedMediaPlayerSupportImpl::CreateNeedKeyCB() {
   return BIND_TO_RENDER_LOOP(&EncryptedMediaPlayerSupportImpl::OnNeedKey);
 }
 
 void EncryptedMediaPlayerSupportImpl::OnPipelineDecryptError() {
   EmeUMAHistogramCounts(current_key_system_, "DecryptError", 1);
 }
 
 void EncryptedMediaPlayerSupportImpl::OnNeedKey(const std::string& type,

[ddorwin, 2014/10/14 18:54:40]

|type| is a bit ambiguous.

[ddorwin, 2014/10/14 18:54:40]

We should update this too sometime.
Note that we have a UMA with this name at 383, though.

                                    const std::vector<uint8>& init_data) {
   // 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_);
   if (init_data_type_.empty())
     init_data_type_ = type;
 
   const uint8* init_data_ptr = init_data.empty() ? NULL : &init_data[0];
-  client_->keyNeeded(
+  client_->encrypted(
       WebString::fromUTF8(type), init_data_ptr, init_data.size());
 }
 
 void EncryptedMediaPlayerSupportImpl::OnKeyAdded(
     const std::string& session_id) {
   EmeUMAHistogramCounts(current_key_system_, "KeyAdded", 1);
   client_->keyAdded(
       WebString::fromUTF8(GetPrefixedKeySystemName(current_key_system_)),
       WebString::fromUTF8(session_id));
 }
@@ skipping 62 matching lines @@
 
   if (web_cdm_) {
     decryptor_ready_cb.Run(web_cdm_->GetDecryptor(), base::Bind(DoNothing));
     return;
   }
 
   decryptor_ready_cb_ = decryptor_ready_cb;
 }
 
 }  // namespace content