Prepare MediaDrmBridge to work with MediaCodecPlayer

content/browser/media/android/media_drm_credential_manager.h

Index: content/browser/media/android/media_drm_credential_manager.h
diff --git a/content/browser/media/android/media_drm_credential_manager.h b/content/browser/media/android/media_drm_credential_manager.h
index 56794e161694eb844ecb70e32b6c4195e9ec6c9d..1bb84284d1497cf3241462b8019926c2f338a87e 100644
--- a/content/browser/media/android/media_drm_credential_manager.h
+++ b/content/browser/media/android/media_drm_credential_manager.h
@@ -52,7 +52,7 @@ class MediaDrmCredentialManager {
   bool ResetCredentialsInternal(SecurityLevel security_level);
 
   // The MediaDrmBridge object used to perform the credential reset.
-  scoped_ptr<media::MediaDrmBridge> media_drm_bridge_;
+  scoped_ptr<media::MediaDrmBridge, media::BrowserCdmDeleter> media_drm_bridge_;

[xhwang, 2015/09/29 17:28:23]

Use BrowserCdmPtr?

[Tima Vaisburd, 2015/09/29 19:55:44]

This seems like the only place that I can do this (see my other comments).
ResetCredentialsInternal() calls media_drm_bridge_->SetSecurityLevel() and
media_drm_bridge_->ResetDeviceCredentials() that are not part of BrowserCdm
interface. But it happens within one method so I can keep a base class pointer
here.

However I'm not sure that this particular change is worth it. Please take
another look.

 
   // The callback provided by the caller.
   ResetCredentialsCB reset_credentials_cb_;