Index: content/renderer/media/crypto/proxy_decryptor.h |
diff --git a/content/renderer/media/crypto/proxy_decryptor.h b/content/renderer/media/crypto/proxy_decryptor.h |
index 336819f1400c4d50e4701ef5a860b9233908555a..686270fa72e205b1cd2da4d4be0c313a737d4b4e 100644 |
--- a/content/renderer/media/crypto/proxy_decryptor.h |
+++ b/content/renderer/media/crypto/proxy_decryptor.h |
@@ -17,7 +17,7 @@ |
class GURL; |
-namespace WebKit { |
+namespace blink { |
#if defined(ENABLE_PEPPER_CDMS) |
class WebFrame; |
class WebMediaPlayerClient; |
@@ -40,8 +40,8 @@ class ProxyDecryptor : public media::MediaKeys { |
public: |
ProxyDecryptor( |
#if defined(ENABLE_PEPPER_CDMS) |
- WebKit::WebMediaPlayerClient* web_media_player_client, |
- WebKit::WebFrame* web_frame, |
+ blink::WebMediaPlayerClient* web_media_player_client, |
+ blink::WebFrame* web_frame, |
#elif defined(OS_ANDROID) |
RendererMediaPlayerManager* manager, |
int media_keys_id, |
@@ -91,8 +91,8 @@ class ProxyDecryptor : public media::MediaKeys { |
void DestroyHelperPlugin(); |
// Needed to create the PpapiDecryptor. |
- WebKit::WebMediaPlayerClient* web_media_player_client_; |
- WebKit::WebFrame* web_frame_; |
+ blink::WebMediaPlayerClient* web_media_player_client_; |
+ blink::WebFrame* web_frame_; |
#elif defined(OS_ANDROID) |
RendererMediaPlayerManager* manager_; |
int media_keys_id_; |