Support "learn more" link for EME in PermissionRequestManager code-path on Android

chrome/browser/permissions/permission_dialog_delegate.cc

 // Copyright 2016 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/permissions/permission_dialog_delegate.h"
 
 #include <utility>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
@@ skipping 142 matching lines @@
 
   std::vector<int> content_settings_types{
       permission_prompt_->GetContentSettingType(0)};
 
   j_delegate_.Reset(Java_PermissionDialogDelegate_create(
       env, reinterpret_cast<uintptr_t>(this), tab_->GetJavaObject(),
       base::android::ToJavaIntArray(env, content_settings_types).obj(),
       ResourceMapper::MapFromChromiumId(
           permission_prompt_->GetIconIdForPermission(0)),
       ConvertUTF16ToJavaString(env, permission_prompt_->GetMessageText(0)),
-      // TODO(timloh): Pass the actual link text for EME.
-      ConvertUTF16ToJavaString(env, base::string16()), primaryButtonText,
-      secondaryButtonText, permission_prompt_->ShouldShowPersistenceToggle()));
+      ConvertUTF16ToJavaString(env, permission_prompt_->GetLinkText()),
+      primaryButtonText, secondaryButtonText,
+      permission_prompt_->ShouldShowPersistenceToggle()));
 }
 
 void PermissionDialogDelegate::Accept(JNIEnv* env,
                                       const JavaParamRef<jobject>& obj,
                                       jboolean persist) {
   if (infobar_delegate_) {
     if (infobar_delegate_->ShouldShowPersistenceToggle())
       infobar_delegate_->set_persist(persist);
     infobar_delegate_->Accept();
     return;
@@ skipping 28 matching lines @@
 
   permission_prompt_->Closing();
 }
 
 void PermissionDialogDelegate::LinkClicked(JNIEnv* env,
                                            const JavaParamRef<jobject>& obj) {
   // Don't call delegate_->LinkClicked() because that relies on having an
   // InfoBarService as an owner() to open the link. That will fail since the
   // wrapped delegate has no owner (it hasn't been added as an infobar).
   if (tab_->web_contents()) {
-    if (infobar_delegate_) {
-      tab_->web_contents()->OpenURL(content::OpenURLParams(
-          infobar_delegate_->GetLinkURL(), content::Referrer(),
-          WindowOpenDisposition::NEW_FOREGROUND_TAB, ui::PAGE_TRANSITION_LINK,
-          false));
-    }
-    // TODO(timloh): Show a 'learn more' link in the PermissionRequestManager
-    // codepath for EME.
+    GURL linkURL = infobar_delegate_ ? infobar_delegate_->GetLinkURL()
+                                     : permission_prompt_->GetLinkURL();
+    tab_->web_contents()->OpenURL(content::OpenURLParams(
+        linkURL, content::Referrer(), WindowOpenDisposition::NEW_FOREGROUND_TAB,
+        ui::PAGE_TRANSITION_LINK, false));
   }
 }
 
 void PermissionDialogDelegate::Destroy(JNIEnv* env,
                                        const JavaParamRef<jobject>& obj) {
   delete this;
 }
 
 PermissionDialogDelegate::PermissionDialogDelegate(
     TabAndroid* tab,
@@ skipping 32 matching lines @@
       navigation_handle->IsSameDocument()) {
     return;
   }
 
   DismissDialog();
 }
 
 void PermissionDialogDelegate::WebContentsDestroyed() {
   DismissDialog();
 }