Use SingleParameterFormatter for settings override permissions.

chrome/common/extensions/permissions/chrome_permission_message_rules.cc

 // Copyright 2014 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/common/extensions/permissions/chrome_permission_message_rules.h"
 
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
 #include "chrome/grit/generated_resources.h"
 #include "extensions/common/permissions/api_permission_set.h"
@@ skipping 284 matching lines @@
       // devices to generate more meaningful messages and better fit the current
       // rules system. Maybe model it similarly to host or socket permissions
       // above.
       {new SingleParameterFormatter(IDS_EXTENSION_PROMPT_WARNING_USB_DEVICE),
        {APIPermission::kUsbDevice},
        {}},
       {new SingleParameterFormatter(
            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},
        {}},
 
       // Coalesced message rules taken from
       // ChromePermissionMessageProvider::GetWarningMessages():
 
       // Access to users' devices should provide a single warning message
       // specifying the transport method used; serial and/or Bluetooth.
       {IDS_EXTENSION_PROMPT_WARNING_BLUETOOTH_SERIAL,
@@ skipping 213 matching lines @@
       // Because warning messages for the "mediaGalleries" permission
       // vary based on the permissions parameters, no message ID or
       // message text is specified here.  The message ID and text used
       // will be determined at run-time in the
       // |MediaGalleriesPermission| class.
 
       {IDS_EXTENSION_PROMPT_WARNING_INTERCEPT_ALL_KEYS,
        {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},
        {}},
 
       // Individual message rules taken from
       // ExtensionsAPIPermissions::GetAllPermissions():
       {IDS_EXTENSION_PROMPT_WARNING_AUDIO_CAPTURE,
        {APIPermission::kAudioCapture},
        {}},
       {IDS_EXTENSION_PROMPT_WARNING_BLUETOOTH_PRIVATE,
@@ skipping 29 matching lines @@
       // SocketsManifestPermission:
       {IDS_EXTENSION_PROMPT_WARNING_SOCKET_ANY_HOST,
        {APIPermission::kSocketAnyHost},
        {}},
       {IDS_EXTENSION_PROMPT_WARNING_NETWORK_STATE,
        {APIPermission::kNetworkState},
        {}},
 
       // 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:
       // From ChromeExtensionsClient::FilterHostPermissions():
       {IDS_EXTENSION_PROMPT_WARNING_FAVICON, {APIPermission::kFavicon}, {}},
   };
 
   std::vector<ChromePermissionMessageRule> rules;
   for (size_t i = 0; i < arraysize(rules_arr); i++) {
     rules.push_back(rules_arr[i]);
@@ skipping 57 matching lines @@
   insert(permission_four);
   insert(permission_five);
   insert(permission_six);
 }
 
 ChromePermissionMessageRule::PermissionIDSetInitializer::
     ~PermissionIDSetInitializer() {
 }
 
 }  // namespace extensions