Allow setContentDecryptionModule() to get called when setting is done.

media/filters/decrypting_audio_decoder.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 "media/filters/decrypting_audio_decoder.h"
 
 #include <cstdlib>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
@@ skipping 148 matching lines @@
     base::ResetAndReturn(&set_decryptor_ready_cb_).Run(DecryptorReadyCB());
   pending_buffer_to_decode_ = NULL;
   if (!init_cb_.is_null())
     base::ResetAndReturn(&init_cb_).Run(DECODER_ERROR_NOT_SUPPORTED);
   if (!decode_cb_.is_null())
     base::ResetAndReturn(&decode_cb_).Run(kAborted);
   if (!reset_cb_.is_null())
     base::ResetAndReturn(&reset_cb_).Run();
 }
 
-void DecryptingAudioDecoder::SetDecryptor(Decryptor* decryptor) {
+void DecryptingAudioDecoder::SetDecryptor(Decryptor* decryptor,
+                                          const base::Closure& done_cb) {
   DVLOG(2) << "SetDecryptor()";
   DCHECK(task_runner_->BelongsToCurrentThread());
   DCHECK_EQ(state_, kDecryptorRequested) << state_;
   DCHECK(!init_cb_.is_null());
   DCHECK(!set_decryptor_ready_cb_.is_null());
 
   set_decryptor_ready_cb_.Reset();
 
   if (!decryptor) {
     base::ResetAndReturn(&init_cb_).Run(DECODER_ERROR_NOT_SUPPORTED);
     state_ = kError;
+    done_cb.Run();

[ddorwin, 2014/07/30 22:35:46]

Shouldn't this reject the promise?
How can we get here?

[jrummell, 2014/08/01 22:09:42]

This is called with NULL if there is a previous decryptor reference pending
(https://code.google.com/p/chromium/codesearch#chromium/src/content/renderer/m...),
and may get called if we enable support for setting mediaKeys = null (step 3.2.3
of setMediakeys(mediaKeys) in the EME spec). Since it currently doesn't stop
this decoder from using the decryptor, it makes sense to fail the promise. Added
a bool parameter to indicate success/failure.

     return;
   }
 
   decryptor_ = decryptor;
 
   InitializeDecoder();
+  done_cb.Run();
 }
 
 void DecryptingAudioDecoder::InitializeDecoder() {
   state_ = kPendingDecoderInit;
   decryptor_->InitializeAudioDecoder(
       config_,
       BindToCurrentLoop(base::Bind(
           &DecryptingAudioDecoder::FinishInitialization, weak_this_)));
 }
 
@@ skipping 153 matching lines @@
     }
 
     frame->set_timestamp(current_time);
     timestamp_helper_->AddFrames(frame->frame_count());
 
     output_cb_.Run(frame);
   }
 }
 
 }  // namespace media