| Index: content/renderer/media/crypto/content_decryption_module_factory.h
|
| diff --git a/content/renderer/media/crypto/content_decryption_module_factory.h b/content/renderer/media/crypto/content_decryption_module_factory.h
|
| index 3d328328dd1b0cc4d9453fd9376f248641ac8396..6a84f0f3ab39a08704a87126ea577a0ad8daa8f9 100644
|
| --- a/content/renderer/media/crypto/content_decryption_module_factory.h
|
| +++ b/content/renderer/media/crypto/content_decryption_module_factory.h
|
| @@ -13,7 +13,7 @@
|
| class GURL;
|
|
|
| #if defined(ENABLE_PEPPER_CDMS)
|
| -namespace WebKit {
|
| +namespace blink {
|
| class WebFrame;
|
| class WebMediaPlayerClient;
|
| }
|
| @@ -29,8 +29,8 @@ class ContentDecryptionModuleFactory {
|
| const std::string& key_system,
|
| #if defined(ENABLE_PEPPER_CDMS)
|
| // TODO(ddorwin): We need different pointers for the WD API.
|
| - WebKit::WebMediaPlayerClient* web_media_player_client,
|
| - WebKit::WebFrame* web_frame,
|
| + blink::WebMediaPlayerClient* web_media_player_client,
|
| + blink::WebFrame* web_frame,
|
| const base::Closure& destroy_plugin_cb,
|
| #elif defined(OS_ANDROID)
|
| RendererMediaPlayerManager* manager,
|
| @@ -43,8 +43,8 @@ class ContentDecryptionModuleFactory {
|
|
|
| #if defined(ENABLE_PEPPER_CDMS)
|
| static void DestroyHelperPlugin(
|
| - WebKit::WebMediaPlayerClient* web_media_player_client,
|
| - WebKit::WebFrame* web_frame);
|
| + blink::WebMediaPlayerClient* web_media_player_client,
|
| + blink::WebFrame* web_frame);
|
| #endif // defined(ENABLE_PEPPER_CDMS)
|
| };
|
|
|
|
|