Encrypted Media: Add config change support in DecryptingAudioDecoder.

media/filters/decrypting_audio_decoder.h

Index: media/filters/decrypting_audio_decoder.h
diff --git a/media/filters/decrypting_audio_decoder.h b/media/filters/decrypting_audio_decoder.h
index 6092d4744ad81d778d46fcaf5f4165107724f403..a8938614b215a53fe363c30df32e5bd790d960bc 100644
--- a/media/filters/decrypting_audio_decoder.h
+++ b/media/filters/decrypting_audio_decoder.h
@@ -24,11 +24,6 @@ class Decryptor;
 // encrypted audio buffers and return decrypted and decompressed audio frames.
 // All public APIs and callbacks are trampolined to the |message_loop_| so
 // that no locks are required for thread safety.
-//
-// TODO(xhwang): For now, DecryptingAudioDecoder relies on the decryptor to do
-// both decryption and audio decoding. Add the path to use the decryptor for
-// decryption only and use other AudioDecoder implementations within
-// DecryptingAudioDecoder for audio decoding.
 class MEDIA_EXPORT DecryptingAudioDecoder : public AudioDecoder {
  public:
   DecryptingAudioDecoder(
@@ -58,6 +53,7 @@ class MEDIA_EXPORT DecryptingAudioDecoder : public AudioDecoder {
     kDecryptorRequested,
     kPendingDecoderInit,
     kIdle,
+    kPendingConfigChange,
     kPendingDemuxerRead,
     kPendingDecode,
     kWaitingForKey,
@@ -72,9 +68,12 @@ class MEDIA_EXPORT DecryptingAudioDecoder : public AudioDecoder {
   // Callback for DecryptorHost::RequestDecryptor().
   void SetDecryptor(Decryptor* decryptor);
 
-  // Callback for Decryptor::InitializeAudioDecoder().
+  // Callback for Decryptor::InitializeAudioDecoder() during initialization.
   void FinishInitialization(bool success);
 
+  // Callback for Decryptor::InitializeVideoDecoder() during config change.

[acolwell GONE FROM CHROMIUM, 2013/01/05 01:25:30]

s/Video/Audio

[xhwang, 2013/01/05 04:09:24]

Done.

+  void FinishConfigChange(bool success);
+
   // Carries out the buffer reading operation scheduled by Read().
   void DoRead(const ReadCB& read_cb);