[Clank] Load origin id before create MediaDrmBridge

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

 // Copyright 2013 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.
 
 #include "chrome/browser/media/android/cdm/media_drm_credential_manager.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/bind.h"
 #include "base/callback_helpers.h"
@@ skipping 76 matching lines @@
 }
 
 // TODO(ddorwin): The key system should be passed in. http://crbug.com/459400
 void MediaDrmCredentialManager::ResetCredentialsInternal(
     SecurityLevel security_level) {
   // Create provision fetcher for the default browser http request context.
   media::CreateFetcherCB create_fetcher_cb =
       base::Bind(&content::CreateProvisionFetcher,
                  g_browser_process->system_request_context());
 
-  ResetCredentialsCB reset_credentials_cb =
-      base::Bind(&MediaDrmCredentialManager::OnResetCredentialsCompleted,
-                 base::Unretained(this), security_level);
+  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)));
+}
 
-  media_drm_bridge_ = media::MediaDrmBridge::CreateWithoutSessionSupport(
-      kWidevineKeySystem, security_level, create_fetcher_cb);
-
+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(
         FROM_HERE, base::Bind(reset_credentials_cb, true));
     return;
   }
 
   media_drm_bridge_->ResetDeviceCredentials(reset_credentials_cb);
 }
 
 // static
 bool MediaDrmCredentialManager::RegisterMediaDrmCredentialManager(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }