[Clank] Load origin id before create MediaDrmBridge

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 <string>
@@ skipping 11 matching lines @@
 }  // 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:
   static bool RegisterMediaDrmStorageBridge(JNIEnv* env);
 
-  MediaDrmStorageBridge(const url::Origin& origin,
-                        const CreateStorageCB& create_storage_cb);
+  MediaDrmStorageBridge();
   ~MediaDrmStorageBridge();
 
+  // Bind origin to |this|. Once storage is initialized, |on_init| will be
+  // called and it will have a random generated origin id for later usage. If
+  // this function isn't called, all the other functions will fail.

[xhwang, 2017/07/21 18:18:26]

"This function must be called before any other function is called.", then DCHECK
in the code.

[yucliu1, 2017/07/21 20:24:09]

Already DCHECK(impl_) which is assigned in Initialize.

+  void Initialize(const url::Origin& origin,
+                  const CreateStorageCB& create_storage_cb,
+                  base::OnceClosure on_init);

[xhwang, 2017/07/21 18:18:27]

nit: s/on_init/init_cb

[yucliu1, 2017/07/21 20:24:09]

Done.

+
+  std::string origin_id() const { return origin_id_; }
+
   // 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>
                      const base::android::JavaParamRef<jobject>& j_callback);
 
@@ skipping 20 matching lines @@
                    // Callback<Boolean>
                    const base::android::JavaParamRef<jobject>& j_callback);
 
  private:
   void RunAndroidBoolCallback(JavaObjectPtr j_callback, bool success);
   void OnSessionDataLoaded(
       JavaObjectPtr j_callback,
       const std::string& session_id,
       std::unique_ptr<MediaDrmStorage::SessionData> session_data);
 
-  MediaDrmStorage* GetStorageImpl();
-
-  CreateStorageCB create_storage_cb_;
   std::unique_ptr<MediaDrmStorage> impl_;
 
-  const url::Origin origin_;
+  // Random generated ID for origin.

[xhwang, 2017/07/21 18:18:26]

nit: Randomly

[yucliu1, 2017/07/21 20:24:09]

Done.

+  std::string origin_id_;
 
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
 
   base::WeakPtrFactory<MediaDrmStorageBridge> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaDrmStorageBridge);
 };
 
 }  // namespace media
 #endif  // MEDIA_BASE_ANDROID_MEDIA_DRM_STORAGE_BRIDGE_H_