Use BCP47 compliant format for locale representation

chrome/android/java/src/org/chromium/chrome/browser/ChromeActivitySessionTracker.java

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser;
 
 import android.app.Activity;
 import android.content.SharedPreferences;
 import android.provider.Settings;
 
 import org.chromium.base.ApplicationState;
 import org.chromium.base.ApplicationStatus;
 import org.chromium.base.ApplicationStatus.ApplicationStateListener;
 import org.chromium.base.ContextUtils;
+import org.chromium.base.LocaleUtils;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.chrome.browser.accessibility.FontSizePrefs;
 import org.chromium.chrome.browser.browsing_data.BrowsingDataType;
 import org.chromium.chrome.browser.browsing_data.TimePeriod;
 import org.chromium.chrome.browser.metrics.UmaUtils;
 import org.chromium.chrome.browser.metrics.VariationsSession;
 import org.chromium.chrome.browser.notifications.NotificationPlatformBridge;
 import org.chromium.chrome.browser.partnercustomizations.PartnerBrowserCustomizations;
 import org.chromium.chrome.browser.preferences.PrefServiceBridge;
 import org.chromium.chrome.browser.share.ShareHelper;
 import org.chromium.chrome.browser.tabmodel.TabModelSelector;
 import org.chromium.chrome.browser.util.FeatureUtilities;
 import org.chromium.content.browser.ChildProcessLauncher;
 
 import java.lang.ref.WeakReference;
-import java.util.Locale;
 
 /**
  * Tracks the foreground session state for the Chrome activities.
  */
 public class ChromeActivitySessionTracker {
 
     private static final String PREF_LOCALE = "locale";
 
     private static ChromeActivitySessionTracker sInstance;
 
@@ skipping 132 matching lines @@
         };
     }
 
     /**
      * Update the accept languages after changing Android locale setting. Doing so kills the
      * Activities but it doesn't kill the Application, so this should be called in
      * {@link #onStart} instead of {@link #initialize}.
      */
     private void updateAcceptLanguages() {
         PrefServiceBridge instance = PrefServiceBridge.getInstance();
-        String localeString = Locale.getDefault().toString();  // ex) en_US, de_DE, zh_CN_#Hans
+        String localeString = LocaleUtils.getDefaultLocale();
         if (hasLocaleChanged(localeString)) {
             instance.resetAcceptLanguages(localeString);
             // Clear cache so that accept-languages change can be applied immediately.
             // TODO(changwan): The underlying BrowsingDataRemover::Remove() is an asynchronous call.
             // So cache-clearing may not be effective if URL rendering can happen before
             // OnBrowsingDataRemoverDone() is called, in which case we may have to reload as well.
             // Check if it can happen.
             instance.clearBrowsingData(
                     null, new int[]{ BrowsingDataType.CACHE }, TimePeriod.ALL_TIME);
         }
@@ skipping 37 matching lines @@
     }
 
     /**
      * @return The PowerBroadcastReceiver for the browser process.
      */
     @VisibleForTesting
     public PowerBroadcastReceiver getPowerBroadcastReceiverForTesting() {
         return mPowerBroadcastReceiver;
     }
 }