Use SingleParameterFormatter for settings override permissions.

chrome/common/extensions/permissions/chrome_permission_message_rules.cc

Index: chrome/common/extensions/permissions/chrome_permission_message_rules.cc
diff --git a/chrome/common/extensions/permissions/chrome_permission_message_rules.cc b/chrome/common/extensions/permissions/chrome_permission_message_rules.cc
index 6b22aad000a35c3bd7af8eb3522fd4b6b6b9bb67..56b37685554fd72c9b49b3d4bc99f669694c4f21 100644
--- a/chrome/common/extensions/permissions/chrome_permission_message_rules.cc
+++ b/chrome/common/extensions/permissions/chrome_permission_message_rules.cc
@@ -302,6 +302,9 @@ ChromePermissionMessageRule::GetAllRules() {
            IDS_EXTENSION_PROMPT_WARNING_USB_DEVICE_UNKNOWN_PRODUCT),
        {APIPermission::kUsbDeviceUnknownProduct},
        {}},
+      {IDS_EXTENSION_PROMPT_WARNING_USB_DEVICE_UNKNOWN_VENDOR,
+       {APIPermission::kUsbDeviceUnknownVendor},
+       {}},
       {new SimpleListFormatter(IDS_EXTENSION_PROMPT_WARNING_USB_DEVICE_LIST),
        {APIPermission::kUsbDeviceList},
        {}},
@@ -535,17 +538,6 @@ ChromePermissionMessageRule::GetAllRules() {
        {APIPermission::kInterceptAllKeys},
        {}},
 
-      // Settings override permission messages.
-      {IDS_EXTENSION_PROMPT_WARNING_HOME_PAGE_SETTING_OVERRIDE,
-       {APIPermission::kHomepage},
-       {}},
-      {IDS_EXTENSION_PROMPT_WARNING_SEARCH_SETTINGS_OVERRIDE,
-       {APIPermission::kSearchProvider},
-       {}},
-      {IDS_EXTENSION_PROMPT_WARNING_START_PAGE_SETTING_OVERRIDE,
-       {APIPermission::kStartupPages},
-       {}},
-
       {IDS_EXTENSION_PROMPT_WARNING_AUDIO_AND_VIDEO_CAPTURE,
        {APIPermission::kAudioCapture, APIPermission::kVideoCapture},
        {}},
@@ -595,19 +587,17 @@ ChromePermissionMessageRule::GetAllRules() {
 
       // API permission rules:
       // SettingsOverrideAPIPermission:
-      {IDS_EXTENSION_PROMPT_WARNING_HOME_PAGE_SETTING_OVERRIDE,
+      {new SingleParameterFormatter(
+           IDS_EXTENSION_PROMPT_WARNING_HOME_PAGE_SETTING_OVERRIDE),
        {APIPermission::kHomepage},
        {}},
-      {IDS_EXTENSION_PROMPT_WARNING_START_PAGE_SETTING_OVERRIDE,
-       {APIPermission::kStartupPages},
-       {}},
-      {IDS_EXTENSION_PROMPT_WARNING_SEARCH_SETTINGS_OVERRIDE,
+      {new SingleParameterFormatter(
+           IDS_EXTENSION_PROMPT_WARNING_SEARCH_SETTINGS_OVERRIDE),
        {APIPermission::kSearchProvider},
        {}},
-
-      // USBDevicePermission:
-      {IDS_EXTENSION_PROMPT_WARNING_USB_DEVICE_UNKNOWN_VENDOR,
-       {APIPermission::kUsbDeviceUnknownVendor},
+      {new SingleParameterFormatter(
+           IDS_EXTENSION_PROMPT_WARNING_START_PAGE_SETTING_OVERRIDE),
+       {APIPermission::kStartupPages},
        {}},
 
       // Other rules: