Fix message text for modal prompts when PermissionRequestManager enabled

chrome/browser/permissions/permission_request_impl.cc

Index: chrome/browser/permissions/permission_request_impl.cc
diff --git a/chrome/browser/permissions/permission_request_impl.cc b/chrome/browser/permissions/permission_request_impl.cc
index 0d38dad85496b1c9fda8c237511671a20a2e236d..9fe592778802c9e96a379c869f6f6e1efa5b5f65 100644
--- a/chrome/browser/permissions/permission_request_impl.cc
+++ b/chrome/browser/permissions/permission_request_impl.cc
@@ -100,6 +100,36 @@ PermissionRequest::IconId PermissionRequestImpl::GetIconId() const {
 #endif
 }
 
+base::string16 PermissionRequestImpl::GetMessageText() const {
+#if !defined(OS_ANDROID)
+  // This is currently only used for modal dialogs on Android.
+  NOTREACHED();
+#endif
+  int message_id;
+  switch (content_settings_type_) {
+    case CONTENT_SETTINGS_TYPE_GEOLOCATION:
+      message_id = IDS_GEOLOCATION_INFOBAR_QUESTION;
+      break;
+    case CONTENT_SETTINGS_TYPE_NOTIFICATIONS:
+    case CONTENT_SETTINGS_TYPE_PUSH_MESSAGING:
+      message_id = IDS_NOTIFICATION_PERMISSIONS;
+      break;
+    case CONTENT_SETTINGS_TYPE_MIDI_SYSEX:
+      message_id = IDS_MIDI_SYSEX_INFOBAR_QUESTION;
+      break;
+    case CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER:
+      message_id = IDS_PROTECTED_MEDIA_IDENTIFIER_INFOBAR_QUESTION;
+      break;
+    default:
+      NOTREACHED();
+      return base::string16();
+  }
+  return l10n_util::GetStringFUTF16(

[Timothy Loh, 2017/05/25 03:12:08]

Logic from PermissionInfoBarDelegate::GetMessageText()

+      message_id,
+      url_formatter::FormatUrlForSecurityDisplay(
+          GetOrigin(), url_formatter::SchemeDisplay::OMIT_CRYPTOGRAPHIC));
+}
+
 base::string16 PermissionRequestImpl::GetMessageTextFragment() const {
   int message_id;
   switch (content_settings_type_) {