Make UI with PermissionRequestManager enabled match PermissionQueueController

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 139 matching lines @@
 
   // TODO(timloh): Handle grouped media permissions (camera + microphone).
   DCHECK_EQ(1u, permission_prompt_->PermissionCount());
 
   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)),
+      ResourceMapper::MapFromChromiumId(permission_prompt_->GetIconId()),
+      ConvertUTF16ToJavaString(env, permission_prompt_->GetMessageText()),
       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())
@@ skipping 88 matching lines @@
       navigation_handle->IsSameDocument()) {
     return;
   }
 
   DismissDialog();
 }
 
 void PermissionDialogDelegate::WebContentsDestroyed() {
   DismissDialog();
 }