ICU msg format support with more than one arguments

extensions/browser/api/device_permissions_prompt.cc

Index: extensions/browser/api/device_permissions_prompt.cc
diff --git a/extensions/browser/api/device_permissions_prompt.cc b/extensions/browser/api/device_permissions_prompt.cc
index 941f883a825b455df5fc2520aa8b1496bd205522..80697482333f3bf15be911cf4d54bd64356a8aea 100644
--- a/extensions/browser/api/device_permissions_prompt.cc
+++ b/extensions/browser/api/device_permissions_prompt.cc
@@ -5,6 +5,7 @@
 #include "extensions/browser/api/device_permissions_prompt.h"
 
 #include "base/bind.h"
+#include "base/i18n/message_formatter.h"
 #include "base/scoped_observer.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
@@ -91,9 +92,8 @@ class UsbDevicePermissionsPrompt : public DevicePermissionsPrompt::Prompt,
   }
 
   base::string16 GetHeading() const override {
-    return l10n_util::GetStringUTF16(
-        multiple() ? IDS_USB_DEVICE_PERMISSIONS_PROMPT_TITLE_MULTIPLE
-                   : IDS_USB_DEVICE_PERMISSIONS_PROMPT_TITLE_SINGLE);
+    return l10n_util::GetSingleOrMultipleStringUTF16(
+        IDS_USB_DEVICE_PERMISSIONS_PROMPT_TITLE, multiple());
   }
 
   void Dismissed() override {
@@ -206,9 +206,8 @@ class HidDevicePermissionsPrompt : public DevicePermissionsPrompt::Prompt,
   }
 
   base::string16 GetHeading() const override {
-    return l10n_util::GetStringUTF16(
-        multiple() ? IDS_HID_DEVICE_PERMISSIONS_PROMPT_TITLE_MULTIPLE
-                   : IDS_HID_DEVICE_PERMISSIONS_PROMPT_TITLE_SINGLE);
+    return l10n_util::GetSingleOrMultipleStringUTF16(
+        IDS_HID_DEVICE_PERMISSIONS_PROMPT_TITLE, multiple());
   }
 
   void Dismissed() override {
@@ -308,10 +307,9 @@ void DevicePermissionsPrompt::Prompt::SetObserver(Observer* observer) {
 }
 
 base::string16 DevicePermissionsPrompt::Prompt::GetPromptMessage() const {
-  return l10n_util::GetStringFUTF16(multiple_
-                                        ? IDS_DEVICE_PERMISSIONS_PROMPT_MULTIPLE
-                                        : IDS_DEVICE_PERMISSIONS_PROMPT_SINGLE,
-                                    base::UTF8ToUTF16(extension_->name()));
+  return base::i18n::MessageFormatter::FormatWithNumberedArgs(
+      l10n_util::GetStringUTF16(IDS_DEVICE_PERMISSIONS_PROMPT),
+      multiple_ ? "multiple" : "single", extension_->name());
 }
 
 base::string16 DevicePermissionsPrompt::Prompt::GetDeviceName(