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 6daa240e7cb13b273ba7e8e4317772a23fa2712d..c371b848f805f19cf8208d7dab95a71c84cfc04a 100644
--- a/media/base/android/media_drm_bridge.h
+++ b/media/base/android/media_drm_bridge.h
@@ -19,6 +19,7 @@
 #include "base/memory/weak_ptr.h"
 #include "base/sequenced_task_runner_helpers.h"
 #include "media/base/android/media_drm_bridge_cdm_context.h"
+#include "media/base/android/media_drm_storage.h"
 #include "media/base/cdm_promise.h"
 #include "media/base/cdm_promise_adapter.h"
 #include "media/base/content_decryption_module.h"
@@ -93,6 +94,7 @@ class MEDIA_EXPORT MediaDrmBridge : public ContentDecryptionModule,
       const std::string& key_system,
       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,
@@ -237,6 +239,7 @@ class MEDIA_EXPORT MediaDrmBridge : public ContentDecryptionModule,
       const std::string& key_system,
       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,
@@ -249,6 +252,7 @@ class MEDIA_EXPORT MediaDrmBridge : public ContentDecryptionModule,
   MediaDrmBridge(const std::vector<uint8_t>& scheme_uuid,
                  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,
@@ -277,6 +281,8 @@ class MEDIA_EXPORT MediaDrmBridge : public ContentDecryptionModule,
   // Called on the |task_runner_| when there is additional usable key.
   void OnHasAdditionalUsableKey();
 
+  void OnStorageResult(bool);
+
   // UUID of the key system.
   std::vector<uint8_t> scheme_uuid_;
 
@@ -295,10 +301,15 @@ 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_;
 
+  std::unique_ptr<MediaDrmStorage> media_drm_storage_;
+
   // Callbacks for firing session events.
   SessionMessageCB session_message_cb_;
   SessionClosedCB session_closed_cb_;