Prepare MediaDrmBridge to work with MediaCodecPlayer

content/browser/media/android/media_drm_credential_manager.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_BROWSER_MEDIA_ANDROID_MEDIA_DRM_CREDENTIAL_MANAGER_H_
 #define CONTENT_BROWSER_MEDIA_ANDROID_MEDIA_DRM_CREDENTIAL_MANAGER_H_
 
 #include <jni.h>
 #include <string>
 
@@ skipping 34 matching lines @@
   // reset is completed.
   void OnResetCredentialsCompleted(SecurityLevel security_level, bool success);
 
   // Resets DRM credentials for a particular |security_level|. Returns false if
   // we fail to create the MediaDrmBridge at all, in which case we cannot reset
   // the credentials. Otherwise, the result is returned asynchronously in
   // OnResetCredentialsCompleted() function.
   bool ResetCredentialsInternal(SecurityLevel security_level);
 
   // The MediaDrmBridge object used to perform the credential reset.
-  scoped_ptr<media::MediaDrmBridge> media_drm_bridge_;
+  media::BrowserCdmPtr media_drm_bridge_;

[xhwang, 2015/09/29 21:04:24]

oops, I totally missed the point. I thought this is a scoped_ptr of BrowserCdm
and didn't realize it's a scoped_ptr of MediaDrmBridge. You can probably define

using ScopedMediaDrmBridgePtr = scoped_ptr<media::MediaDrmBridge,
media::BrowserCdmDeleter>;

in media_drm_bridge.h and then use ScopedMediaDrmBridgePtr everywhere you need
it.

With that, I think the old code looks better (to avoid an extra cast). Sorry for
the confusion.

[Tima Vaisburd, 2015/09/29 21:51:40]

Done.

 
   // The callback provided by the caller.
   ResetCredentialsCB reset_credentials_cb_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaDrmCredentialManager);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_MEDIA_ANDROID_MEDIA_DRM_CREDENTIAL_MANAGER_H_