Use BCP47 compliant format for locale representation

android_webview/java/src/org/chromium/android_webview/AwContents.java

Index: android_webview/java/src/org/chromium/android_webview/AwContents.java
diff --git a/android_webview/java/src/org/chromium/android_webview/AwContents.java b/android_webview/java/src/org/chromium/android_webview/AwContents.java
index a21d244fd978a3570cf0eac90c6aaed2b7d85eee..5f7ca6f26580a7ab099001c523ea138f0b468a05 100644
--- a/android_webview/java/src/org/chromium/android_webview/AwContents.java
+++ b/android_webview/java/src/org/chromium/android_webview/AwContents.java
@@ -66,7 +66,6 @@ import org.chromium.content.browser.SmartClipProvider;
 import org.chromium.content_public.browser.GestureStateListener;
 import org.chromium.content_public.browser.JavaScriptCallback;
 import org.chromium.content_public.browser.LoadUrlParams;
-import org.chromium.content_public.browser.MessagePort;
 import org.chromium.content_public.browser.NavigationController;
 import org.chromium.content_public.browser.NavigationHistory;
 import org.chromium.content_public.browser.WebContents;
@@ -87,6 +86,7 @@ import java.net.URL;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.WeakHashMap;
 import java.util.concurrent.Callable;
 
@@ -705,7 +705,7 @@ public class AwContents implements SmartClipProvider,
 
         @Override
         public void onConfigurationChanged(Configuration configuration) {
-            setLocale(LocaleUtils.getLocale(configuration.locale));
+            setLocale(LocaleUtils.getLocaleString(configuration.locale));
             mSettings.updateAcceptLanguages();
         }
     };
@@ -741,7 +741,7 @@ public class AwContents implements SmartClipProvider,
             InternalAccessDelegate internalAccessAdapter,
             NativeDrawGLFunctorFactory nativeDrawGLFunctorFactory, AwContentsClient contentsClient,
             AwSettings settings, DependencyFactory dependencyFactory) {
-        setLocale(LocaleUtils.getDefaultLocale());
+        setLocale(LocaleUtils.getDefaultLocaleString());
         settings.updateAcceptLanguages();
 
         mBrowserContext = browserContext;
@@ -2246,15 +2246,14 @@ public class AwContents implements SmartClipProvider,
      *                  message ports to pass.
      */
     public void postMessageToFrame(
-            String frameName, String message, String targetOrigin, MessagePort[] sentPorts) {
+            String frameName, String message, String targetOrigin, AppWebMessagePort[] sentPorts) {
         if (isDestroyed(WARN)) return;
         if (mPostMessageSender == null) {
             AppWebMessagePortService service = mBrowserContext.getMessagePortService();
             mPostMessageSender = new PostMessageSender(this, service);
             service.addObserver(mPostMessageSender);
         }
-        mPostMessageSender.postMessage(frameName, message, targetOrigin,
-                (AppWebMessagePort[]) sentPorts);
+        mPostMessageSender.postMessage(frameName, message, targetOrigin, sentPorts);
     }
 
     // Implements PostMessageSender.PostMessageSenderDelegate interface method.
@@ -3149,7 +3148,7 @@ public class AwContents implements SmartClipProvider,
             postUpdateContentViewCoreVisibility();
             mCurrentFunctor.onAttachedToWindow();
 
-            setLocale(LocaleUtils.getDefaultLocale());
+            setLocale(LocaleUtils.getDefaultLocaleString());
             mSettings.updateAcceptLanguages();
 
             if (mComponentCallbacks != null) return;