[Clank] Load origin id before create MediaDrmBridge

chrome/browser/media/android/cdm/media_drm_credential_manager.cc

Index: chrome/browser/media/android/cdm/media_drm_credential_manager.cc
diff --git a/chrome/browser/media/android/cdm/media_drm_credential_manager.cc b/chrome/browser/media/android/cdm/media_drm_credential_manager.cc
index b5c369c14e3048e3460327a9846341ee4a455f51..6b036ddc0b5f69b1f8cc38782caaf9338e09d4ef 100644
--- a/chrome/browser/media/android/cdm/media_drm_credential_manager.cc
+++ b/chrome/browser/media/android/cdm/media_drm_credential_manager.cc
@@ -94,13 +94,17 @@ void MediaDrmCredentialManager::ResetCredentialsInternal(
       base::Bind(&content::CreateProvisionFetcher,
                  g_browser_process->system_request_context());
 
-  ResetCredentialsCB reset_credentials_cb =
-      base::Bind(&MediaDrmCredentialManager::OnResetCredentialsCompleted,
-                 base::Unretained(this), security_level);
-
-  media_drm_bridge_ = media::MediaDrmBridge::CreateWithoutSessionSupport(
-      kWidevineKeySystem, security_level, create_fetcher_cb);
+  media::MediaDrmBridge::CreateWithoutSessionSupport(
+      kWidevineKeySystem, security_level, create_fetcher_cb,
+      base::BindOnce(
+          &MediaDrmCredentialManager::OnMediaDrmCreated, base::Unretained(this),

[xhwang, 2017/05/03 06:00:55]

This is not new code. But I wonder how is base::Unretained safe here?

[yucliu1, 2017/05/03 06:33:49]

I don't know actually. I'm just copying the old behavior. Let me check.

[yucliu1, 2017/05/10 20:41:38]

It's safe because it's a singleton.

+          base::Bind(&MediaDrmCredentialManager::OnResetCredentialsCompleted,
+                     base::Unretained(this), security_level)));
+}
 
+void MediaDrmCredentialManager::OnMediaDrmCreated(
+    const ResetCredentialsCB& reset_credentials_cb,
+    scoped_refptr<media::MediaDrmBridge> cdm) {

[xhwang, 2017/05/03 06:00:55]

Do you need to set media_drm_bridge_ here? e.g.
media_drm_bridge_ = cdm?

[yucliu1, 2017/05/03 06:33:49]

Yes. Good catch.

[yucliu1, 2017/05/10 20:41:38]

Done.

   // No need to reset credentials for unsupported |security_level|.
   if (!media_drm_bridge_) {
     base::ThreadTaskRunnerHandle::Get()->PostTask(