Add CDM video decoder.

webkit/media/crypto/ppapi/clear_key_cdm.h

Index: webkit/media/crypto/ppapi/clear_key_cdm.h
diff --git a/webkit/media/crypto/ppapi/clear_key_cdm.h b/webkit/media/crypto/ppapi/clear_key_cdm.h
index 8d185ffa5ca96b54ddfeb424acc3fdd8f5715a7d..e5a6cc719653d208c86e9142f1665b3548376df2 100644
--- a/webkit/media/crypto/ppapi/clear_key_cdm.h
+++ b/webkit/media/crypto/ppapi/clear_key_cdm.h
@@ -10,6 +10,7 @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/synchronization/lock.h"
 #include "media/base/decryptor_client.h"
 #include "media/crypto/aes_decryptor.h"
@@ -18,12 +19,18 @@
 // Enable this to use the fake decoder for testing.
 // #define CLEAR_KEY_CDM_USE_FAKE_VIDEO_DECODER
 
+#if defined(CLEAR_KEY_CDM_USE_FAKE_VIDEO_DECODER)
+#undef CLEAR_KEY_CDM_USE_FFMPEG_DECODER
+#endif
+
 namespace media {
 class DecoderBuffer;
 }
 
 namespace webkit_media {
 
+class FFmpegCdmVideoDecoder;
+
 // Clear key implementation of the cdm::ContentDecryptionModule interface.
 class ClearKeyCdm : public cdm::ContentDecryptionModule {
  public:
@@ -120,6 +127,10 @@ class ClearKeyCdm : public cdm::ContentDecryptionModule {
 
   cdm::Allocator* const allocator_;
 
+#if defined(CLEAR_KEY_CDM_USE_FFMPEG_DECODER)
+  scoped_ptr<FFmpegCdmVideoDecoder> video_decoder_;
+#endif
+
 #if defined(CLEAR_KEY_CDM_USE_FAKE_VIDEO_DECODER)
   cdm::Size video_size_;
 #endif  // CLEAR_KEY_CDM_USE_FAKE_VIDEO_DECODER