media: Add MediaDrmStorage

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 261b46256fea3f23d85a748cd110c300e1d1384b..598d20f5a8e751ee85ad0b6919429d1059e64fd2 100644
--- a/media/base/android/media_drm_bridge.h
+++ b/media/base/android/media_drm_bridge.h
@@ -20,6 +20,7 @@
 #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.h"
 #include "media/base/android/media_drm_storage_bridge.h"
 #include "media/base/cdm_promise.h"
 #include "media/base/cdm_promise_adapter.h"
@@ -96,6 +97,7 @@ class MEDIA_EXPORT MediaDrmBridge : public ContentDecryptionModule,
       const GURL& security_origin,
       SecurityLevel security_level,
       const CreateFetcherCB& create_fetcher_cb,
+      const CreateStorageCB& create_storage_cb,
       const SessionMessageCB& session_message_cb,
       const SessionClosedCB& session_closed_cb,
       const SessionKeysChangeCB& session_keys_change_cb,
@@ -243,6 +245,7 @@ class MEDIA_EXPORT MediaDrmBridge : public ContentDecryptionModule,
       const GURL& security_origin,
       SecurityLevel security_level,
       const CreateFetcherCB& create_fetcher_cb,
+      const CreateStorageCB& create_storage_cb,
       const SessionMessageCB& session_message_cb,
       const SessionClosedCB& session_closed_cb,
       const SessionKeysChangeCB& session_keys_change_cb,
@@ -256,6 +259,7 @@ class MEDIA_EXPORT MediaDrmBridge : public ContentDecryptionModule,
                  const GURL& security_origin,
                  SecurityLevel security_level,
                  const CreateFetcherCB& create_fetcher_cb,
+                 const CreateStorageCB& create_storage_cb,
                  const SessionMessageCB& session_message_cb,
                  const SessionClosedCB& session_closed_cb,
                  const SessionKeysChangeCB& session_keys_change_cb,
@@ -302,6 +306,9 @@ class MEDIA_EXPORT MediaDrmBridge : public ContentDecryptionModule,
   // The callback to create a ProvisionFetcher.
   CreateFetcherCB create_fetcher_cb_;
 
+  // The callback to create a MediaDrmStorage.
+  CreateStorageCB create_storage_cb_;
+
   // The ProvisionFetcher that requests and receives provisioning data.
   // Non-null iff when a provision request is pending.
   std::unique_ptr<ProvisionFetcher> provision_fetcher_;