Fix message text for modal prompts when PermissionRequestManager enabled

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 @@
   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)),
-      // TODO(timloh): This is the wrong string.
-      ConvertUTF16ToJavaString(env,
-                               permission_prompt_->GetMessageTextFragment(0)),
+      ConvertUTF16ToJavaString(env, permission_prompt_->GetMessageText(0)),
       // TODO(timloh): Pass the actual link text for EME.
       ConvertUTF16ToJavaString(env, base::string16()), primaryButtonText,
       secondaryButtonText,
       // TODO(timloh): Hook up the persistence toggle.
       false));
 }
 
 void PermissionDialogDelegate::Accept(JNIEnv* env,
                                       const JavaParamRef<jobject>& obj,
                                       jboolean persist) {
@@ skipping 91 matching lines @@
   }
 
   DismissDialog();
   delete this;
 }
 
 void PermissionDialogDelegate::WebContentsDestroyed() {
   DismissDialog();
   delete this;
 }