[Clank] Add JNI interface for media persistent license storage

media/base/android/media_drm_bridge.h

Index: media/base/android/media_drm_bridge.h
diff --git a/media/base/android/media_drm_bridge.h b/media/base/android/media_drm_bridge.h
index 3f37a685a022cac83f214d41889b1194b2d4c920..13fa4ef14ea6904bf7fd068601c9fc8bc7d97b24 100644
--- a/media/base/android/media_drm_bridge.h
+++ b/media/base/android/media_drm_bridge.h
@@ -18,7 +18,9 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/sequenced_task_runner_helpers.h"
+#include "media/base/android/android_util.h"
 #include "media/base/android/media_drm_bridge_cdm_context.h"
+#include "media/base/android/media_drm_storage_bridge.h"
 #include "media/base/cdm_promise.h"
 #include "media/base/cdm_promise_adapter.h"
 #include "media/base/content_decryption_module.h"
@@ -266,9 +268,6 @@ class MEDIA_EXPORT MediaDrmBridge : public ContentDecryptionModule,
   // Get the security level of the media.
   SecurityLevel GetSecurityLevel();
 
-  // A helper method to create a JavaObjectPtr.
-  JavaObjectPtr CreateJavaObjectPtr(jobject object);
-
   // A helper method that is called when MediaCrypto is ready.
   void NotifyMediaCryptoReady(JavaObjectPtr j_media_crypto);
 
@@ -323,6 +322,8 @@ class MEDIA_EXPORT MediaDrmBridge : public ContentDecryptionModule,
 
   MediaDrmBridgeCdmContext media_drm_bridge_cdm_context_;
 
+  MediaDrmStorageBridge storage_;

[xhwang, 2017/03/30 23:33:42]

Just in case |j_media_drm_| ties to talk to the |storage_| during destruction,
declare this before |j_media_drm_|?

[yucliu1, 2017/03/31 00:57:17]

Done.

+
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<MediaDrmBridge> weak_factory_;