diff options
Diffstat (limited to 'content/renderer/media/android')
| -rw-r--r-- | content/renderer/media/android/webmediaplayer_android.cc | 2 | ||||
| -rw-r--r-- | content/renderer/media/android/webmediaplayer_android.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/content/renderer/media/android/webmediaplayer_android.cc b/content/renderer/media/android/webmediaplayer_android.cc index 196b9a7..deb3417 100644 --- a/content/renderer/media/android/webmediaplayer_android.cc +++ b/content/renderer/media/android/webmediaplayer_android.cc @@ -1508,7 +1508,7 @@ WebMediaPlayerAndroid::GenerateKeyRequestInternal( // We do not support run-time switching between key systems for now. if (current_key_system_.empty()) { if (!proxy_decryptor_) { - proxy_decryptor_.reset(new ProxyDecryptor( + proxy_decryptor_.reset(new media::ProxyDecryptor( base::Bind(&WebMediaPlayerAndroid::OnKeyAdded, weak_factory_.GetWeakPtr()), base::Bind(&WebMediaPlayerAndroid::OnKeyError, diff --git a/content/renderer/media/android/webmediaplayer_android.h b/content/renderer/media/android/webmediaplayer_android.h index 771074d..0da37eb 100644 --- a/content/renderer/media/android/webmediaplayer_android.h +++ b/content/renderer/media/android/webmediaplayer_android.h @@ -22,12 +22,12 @@ #include "content/renderer/media/android/media_info_loader.h" #include "content/renderer/media/android/media_source_delegate.h" #include "content/renderer/media/android/stream_texture_factory.h" -#include "content/renderer/media/crypto/proxy_decryptor.h" #include "gpu/command_buffer/common/mailbox.h" #include "media/base/android/media_player_android.h" #include "media/base/demuxer_stream.h" #include "media/base/media_keys.h" #include "media/base/time_delta_interpolator.h" +#include "media/cdm/proxy_decryptor.h" #include "third_party/WebKit/public/platform/WebGraphicsContext3D.h" #include "third_party/WebKit/public/platform/WebMediaPlayer.h" #include "third_party/WebKit/public/platform/WebSize.h" @@ -473,7 +473,7 @@ class WebMediaPlayerAndroid : public blink::WebMediaPlayer, std::string init_data_type_; // Manages decryption keys and decrypts encrypted frames. - scoped_ptr<ProxyDecryptor> proxy_decryptor_; + scoped_ptr<media::ProxyDecryptor> proxy_decryptor_; // Non-owned pointer to the CDM. Updated via calls to // setContentDecryptionModule(). |