diff options
| author | ycheo@chromium.org <ycheo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-17 06:52:19 +0000 |
|---|---|---|
| committer | ycheo@chromium.org <ycheo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-17 06:52:19 +0000 |
| commit | 693f63ce16212bceba55cabe7730229f5c8282af (patch) | |
| tree | 5f61e816ac3f1f2cbd4003637b585161076cfea8 /content/renderer/media/crypto | |
| parent | 8d5ded694b0f65e5d47a16967709e1ab6aab42f5 (diff) | |
| download | chromium_src-693f63ce16212bceba55cabe7730229f5c8282af.zip chromium_src-693f63ce16212bceba55cabe7730229f5c8282af.tar.gz chromium_src-693f63ce16212bceba55cabe7730229f5c8282af.tar.bz2 | |
Remove Chrome for TV code.
BUG=334126
Review URL: https://codereview.chromium.org/136343002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@245449 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/media/crypto')
| -rw-r--r-- | content/renderer/media/crypto/key_systems.cc | 5 | ||||
| -rw-r--r-- | content/renderer/media/crypto/ppapi_decryptor.cc | 11 |
2 files changed, 0 insertions, 16 deletions
diff --git a/content/renderer/media/crypto/key_systems.cc b/content/renderer/media/crypto/key_systems.cc index 4102533..ac3f4aa 100644 --- a/content/renderer/media/crypto/key_systems.cc +++ b/content/renderer/media/crypto/key_systems.cc @@ -36,7 +36,6 @@ const char kMp4a[] = "mp4a"; const char kMp4aAvc1Avc3[] = "mp4a,avc1,avc3"; #endif // defined(USE_PROPRIETARY_CODECS) -#if !defined(GOOGLE_TV) inline std::string KeySystemNameForUMAInternal( const blink::WebString& key_system) { if (key_system == kClearKeyKeySystem) @@ -47,10 +46,6 @@ inline std::string KeySystemNameForUMAInternal( #endif // WIDEVINE_CDM_AVAILABLE return "Unknown"; } -#else -// Declares the function, which is defined in another file. -std::string KeySystemNameForUMAInternal(const blink::WebString& key_system); -#endif // !defined(GOOGLE_TV) // Convert a WebString to ASCII, falling back on an empty string in the case // of a non-ASCII string. diff --git a/content/renderer/media/crypto/ppapi_decryptor.cc b/content/renderer/media/crypto/ppapi_decryptor.cc index b60afaa..cf7808c 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, |