Unpunycode search keywords and short names.

chrome/browser/extensions/api/search_engines_private/search_engines_private_api.cc

Index: chrome/browser/extensions/api/search_engines_private/search_engines_private_api.cc
diff --git a/chrome/browser/extensions/api/search_engines_private/search_engines_private_api.cc b/chrome/browser/extensions/api/search_engines_private/search_engines_private_api.cc
index 3e23b25251529e9aef885f166659fc8118bda6a8..4234949025e7e6fa776ab5d6ce994b08dd33cad1 100644
--- a/chrome/browser/extensions/api/search_engines_private/search_engines_private_api.cc
+++ b/chrome/browser/extensions/api/search_engines_private/search_engines_private_api.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/extensions/api/search_engines_private/search_engines_private_api.h"
 
+#include <string>
+
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
@@ -21,6 +23,7 @@
 #include "components/signin/core/browser/signin_manager.h"
 #include "components/signin/core/browser/signin_manager_base.h"
 #include "extensions/browser/extension_function_registry.h"
+#include "net/base/net_util.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace extensions {
@@ -120,8 +123,9 @@ SearchEnginesPrivateAddOtherSearchEngineFunction::Run() {
   EXTENSION_FUNCTION_VALIDATE(parameters.get());
 
   TemplateURLData data;
-  data.SetShortName(base::UTF8ToUTF16(parameters->name));
-  data.SetKeyword(base::UTF8ToUTF16(parameters->keyword));
+  // Unpunycode short name and keyword.
+  data.SetShortName(net::IDNToUnicode(parameters->name, std::string()));

[Matt Giuca, 2015/07/17 04:13:11]

This should not be unpunycoded. The name and keyword parameters are not domains
and should not be expected to be Punycode-encoded (they are being passed in
through an API).

If the rationale for this change is that users might type in an IDN-encoded
domain into the "keyword" or "short name" field, and that will get passed
through this API, and we want to decode those, I would say:
a) that is not our concern. The user typed/pasted a string into a text field,
and we should respect that string. There is no reason to decode the string in
this text field any more than if they typed/pasted it into any other text field.
b) if we did want to decode that user input, it should be done at the user
interface level, not at the API level. You should do the decoding in the
settings page UI, not here.

[alshabalin, 2015/07/20 14:06:37]

Done.

+  data.SetKeyword(net::IDNToUnicode(parameters->keyword, std::string()));
   data.SetURL(parameters->url);
   TemplateURL* turl = new TemplateURL(data);