Fix packing localized strings for //remoting.

remoting/remoting_locales.gni

Index: remoting/remoting_locales.gni
diff --git a/remoting/remoting_locales.gni b/remoting/remoting_locales.gni
index a9702de66ef8688e85f12308268e3b4848b0dc80..12834ab993ec10936231b9e2895b8bd0142664aa 100644
--- a/remoting/remoting_locales.gni
+++ b/remoting/remoting_locales.gni
@@ -92,19 +92,33 @@ remoting_locales_with_underscores += [
   "zh_TW",
 ]
 
-if (is_chromeos) {
+if (is_chromeos || is_ios) {

[Wez, 2017/04/18 18:05:26]

nit: Let's make sure to retain comments that explain why we need these ugly
special-cases.

[sdefresne, 2017/04/19 08:59:03]

Done.

BTW, do you know why remoting uses "en-GB", "en" and "en-US" (only for ChromeOS
and Chrome on iOS) while Chrome itself only "en-GB" and "en-US" (for all
platforms).

[Wez, 2017/04/20 03:41:21]

No, I'm afraid you will need to ask jamiewalch@ or sergeyu@ about that (I am
OWNERS alumnus so wasn't expecting tough questions ;)

   remoting_locales += [ "en-US" ]
   remoting_locales_with_underscores += [ "en_US" ]
 }
 
-messages_locales = remoting_locales_with_underscores
-if (!is_chromeos) {
-  # The messages output includes a separate one for en-US that the pak ones
-  # don't have. We don't need to do this on ChromeOS since en_US is in the
-  # locales list be default there.
-  messages_locales += [ "en_US" ]
+if (is_ios) {

[Wez, 2017/04/18 18:05:26]

nit: This might be more readable as an if...else with just += clauses for the
two cases.

[sdefresne, 2017/04/19 08:59:03]

Done.

+  remoting_locales -= [
+    "pt-BR",
+    "es-419",
+  ]
+  remoting_locales += [
+    "pt",
+    "es-MX",
+  ]
+
+  remoting_locales_with_underscores -= [
+    "pt_BR",
+    "es_419",
+  ]
+  remoting_locales_with_underscores += [
+    "pt",
+    "es_MX",
+  ]
 }
 
+messages_locales = remoting_locales_with_underscores
+
 remoting_android_locales = [
   "am",
   "ar",