Use BCP47 compliant format for locale representation

base/android/java/src/org/chromium/base/ResourceExtractor.java

Index: base/android/java/src/org/chromium/base/ResourceExtractor.java
diff --git a/base/android/java/src/org/chromium/base/ResourceExtractor.java b/base/android/java/src/org/chromium/base/ResourceExtractor.java
index 6de87fe3e18d383f616e46d256bbc06b95692918..78461f6f580a6f5f9cfd88b95a3e8d3ae8a482ec 100644
--- a/base/android/java/src/org/chromium/base/ResourceExtractor.java
+++ b/base/android/java/src/org/chromium/base/ResourceExtractor.java
@@ -173,12 +173,13 @@ public class ResourceExtractor {
     }
 
     private static String[] detectFilesToExtract() {
-        String language = LocaleUtils.getLanguage(Locale.getDefault());
+        String originalLanguage = Locale.getDefault().getLanguage();
+        String updatedLanguage = LocaleUtils.updateLanguageForChromium(originalLanguage);

[Seigo Nonaka, 2016/10/17 11:30:46]

I don't think we should expose updateLanguageForChromium.
How about changing LocaleUtils.getDefaultLocale() to return Locale object
instead of String.

String language = LocaleUtils.getDefaultLocale().getLanguage();

[Yirui Huang, 2016/10/17 13:42:28]

since the original getLanguage does the same thing as updateLanguageForChromium,
and updateLanguageForChromium should not be exposed. I made
LocaleUtils.getLanguage, which can be used in this situation. 

         // Currenty (Oct 2016), this array can be as big as 4 entries, so using a capacity
         // that allows a bit of growth, but is still in the right ballpark..
         ArrayList<String> activeLocalePakFiles = new ArrayList<String>(6);
         for (String locale : BuildConfig.COMPRESSED_LOCALES) {
-            if (locale.startsWith(language)) {
+            if (locale.startsWith(updatedLanguage)) {
                 activeLocalePakFiles.add(locale + ".pak");
             }
         }