Encrypted Media: Replace DecryptorClient with key event callbacks.

webkit/media/webmediaplayer_impl.cc

 // Copyright (c) 2012 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 "webkit/media/webmediaplayer_impl.h"
 
 #include <limits>
 #include <string>
 #include <vector>
 
@@ skipping 138 matching lines @@
       media_stream_client_(media_stream_client),
       media_log_(media_log),
       accelerated_compositing_reported_(false),
       incremented_externally_allocated_memory_(false),
       audio_source_provider_(audio_source_provider),
       audio_renderer_sink_(audio_renderer_sink),
       is_local_source_(false),
       supports_save_(true),
       decryptor_(message_loop_factory_->GetMessageLoop(
                      media::MessageLoopFactory::kDecoder),
-                 proxy_.get(),
+                 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnKeyAdded),
+                 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnKeyError),
+                 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnKeyMessage),
+                 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnNeedKey),
                  client,
                  frame),
       starting_(false) {
   media_log_->AddEvent(
       media_log_->CreateEvent(media::MediaLogEvent::WEBMEDIAPLAYER_CREATED));
 
   scoped_refptr<base::MessageLoopProxy> pipeline_message_loop =
       message_loop_factory_->GetMessageLoop(
           media::MessageLoopFactory::kPipeline);
   pipeline_ = new media::Pipeline(pipeline_message_loop, media_log_);
@@ skipping 926 matching lines @@
   return audio_source_provider_;
 }
 
 void WebMediaPlayerImpl::IncrementExternallyAllocatedMemory() {
   DCHECK_EQ(main_loop_, MessageLoop::current());
   incremented_externally_allocated_memory_ = true;
   v8::V8::AdjustAmountOfExternalAllocatedMemory(kPlayerExtraMemory);
 }
 
 }  // namespace webkit_media