[Clank] Implement MediaDrmStorageBridge with MediaDrmStorage

media/base/android/media_drm_storage_bridge.h

 // Copyright 2017 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 MEDIA_BASE_ANDROID_MEDIA_DRM_STORAGE_BRIDGE_H_
 #define MEDIA_BASE_ANDROID_MEDIA_DRM_STORAGE_BRIDGE_H_
 
 #include <jni.h>
 #include <memory>
 
 #include "base/android/scoped_java_ref.h"
+#include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
+#include "media/base/android/media_drm_storage.h"
+#include "url/origin.h"
 
 namespace base {
 class SingleThreadTaskRunner;
 }  // namespace base
 
 namespace media {
 
 // This class is the native version of MediaDrmStorageBridge in Java. It's used
 // to talk to the concrete implementation for persistent data management.
 class MediaDrmStorageBridge {
  public:
+  using OnceCreateStorageCB =
+      base::OnceCallback<std::unique_ptr<MediaDrmStorage>()>;

[xhwang, 2017/04/07 05:47:35]

Can you reuse the CreateStorageCB?

https://cs.chromium.org/chromium/src/media/base/android/media_drm_storage.h

Feel free to change that one to OnceCallback.

[yucliu1, 2017/04/07 18:53:10]

Re-use CreateStorageCB. AndroidCdmFactory need to pass create_storage_cb to
different MediaDrmBridge, OnceCallback doesn't work for that case.

+
   static bool RegisterMediaDrmStorageBridge(JNIEnv* env);
 
-  MediaDrmStorageBridge();
+  MediaDrmStorageBridge(const url::Origin& origin,
+                        OnceCreateStorageCB create_storage_cb);
   ~MediaDrmStorageBridge();
 
   // The following OnXXX functions are called by Java. The functions will post
   // task on message loop immediately to avoid reentrancy issues.
 
   // Called by the java object when device provision is finished. Implementation
   // will record the time as provisioning time.
   void OnProvisioned(JNIEnv* env,
                      const base::android::JavaParamRef<jobject>& j_storage,
                      // Callback<Boolean>
@@ skipping 16 matching lines @@
                   const base::android::JavaParamRef<jobject>& j_callback);
 
   // Called by the java object to remove persistent session data.
   void OnClearInfo(JNIEnv* env,
                    const base::android::JavaParamRef<jobject>& j_storage,
                    const base::android::JavaParamRef<jbyteArray>& j_session_id,
                    // Callback<Boolean>
                    const base::android::JavaParamRef<jobject>& j_callback);
 
  private:
+  MediaDrmStorage* GetStorageImpl();
+
+  // Post |task| on |task_runner_|, |task| won't run if this object is deleted.
+  void PostCancellableTask(base::OnceClosure task);
+  void RunCancellableTask(base::OnceClosure task);
+
+  OnceCreateStorageCB create_storage_cb_;
+  std::unique_ptr<MediaDrmStorage> impl_;
+
+  const url::Origin origin_;
+
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
 
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<MediaDrmStorageBridge> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaDrmStorageBridge);
 };
 
 }  // namespace media
 #endif  // MEDIA_BASE_ANDROID_MEDIA_DRM_STORAGE_BRIDGE_H_