Issue 71980: Extensions code should use UTF-16 for user-visible Unicode strings

chrome/common/extensions/extension_error_utils.cc

Index: chrome/common/extensions/extension_error_utils.cc
===================================================================
--- chrome/common/extensions/extension_error_utils.cc	(revision 114019)
+++ chrome/common/extensions/extension_error_utils.cc	(working copy)
@@ -5,6 +5,7 @@
 #include "chrome/common/extensions/extension_error_utils.h"
 
 #include "base/string_util.h"
+#include "base/utf_string_conversions.h"
 
 std::string ExtensionErrorUtils::FormatErrorMessage(
     const std::string& format,
@@ -35,3 +36,34 @@
   ReplaceFirstSubstringAfterOffset(&ret_val, 0, "*", s3);
   return ret_val;
 }
+
+string16 ExtensionErrorUtils::FormatErrorMessageUTF16(
+    const std::string& format,
+    const std::string& s1) {
+  std::string ret_val = format;
+  ReplaceFirstSubstringAfterOffset(&ret_val, 0, "*", s1);
+  return UTF8ToUTF16(ret_val);
+}
+
+string16 ExtensionErrorUtils::FormatErrorMessageUTF16(
+    const std::string& format,
+    const std::string& s1,
+    const std::string& s2) {
+  std::string ret_val = format;
+  ReplaceFirstSubstringAfterOffset(&ret_val, 0, "*", s1);
+  ReplaceFirstSubstringAfterOffset(&ret_val, 0, "*", s2);
+  return UTF8ToUTF16(ret_val);
+}
+
+string16 ExtensionErrorUtils::FormatErrorMessageUTF16(
+    const std::string& format,
+    const std::string& s1,
+    const std::string& s2,
+    const std::string& s3) {
+  std::string ret_val = format;
+  ReplaceFirstSubstringAfterOffset(&ret_val, 0, "*", s1);
+  ReplaceFirstSubstringAfterOffset(&ret_val, 0, "*", s2);
+  ReplaceFirstSubstringAfterOffset(&ret_val, 0, "*", s3);
+  return UTF8ToUTF16(ret_val);
+}
+