Index: content/renderer/media/crypto/ppapi_decryptor.cc |
diff --git a/content/renderer/media/crypto/ppapi_decryptor.cc b/content/renderer/media/crypto/ppapi_decryptor.cc |
index b60afaa757bf14c8342e13b56c1f9978fc8e0f7a..cf7808c3f5d5312b66fee9ddccd3fdaf761fa21b 100644 |
--- a/content/renderer/media/crypto/ppapi_decryptor.cc |
+++ b/content/renderer/media/crypto/ppapi_decryptor.cc |
@@ -143,18 +143,7 @@ void PpapiDecryptor::ReleaseSession(uint32 session_id) { |
} |
media::Decryptor* PpapiDecryptor::GetDecryptor() { |
-#if defined(GOOGLE_TV) |
- // Google TV only uses PpapiDecrytor as a MediaKeys and does not need the |
- // Decryptor interface of the PpapiDecryptor. |
- // Details: If we don't do this GTV will be broken. The reason is that during |
- // initialization, MediaSourceDelegate tries to use DecryptingDemuxerStream |
- // to decrypt the stream in the renderer process (for ClearKey support). |
- // However, for GTV, PpapiDecryptor cannot do decryption at all. By returning |
- // NULL, DDS init will fail and we fallback to what GTV used to do. |
- return NULL; |
-#else |
return this; |
-#endif // defined(GOOGLE_TV) |
} |
void PpapiDecryptor::RegisterNewKeyCB(StreamType stream_type, |