Adjust Chrome to normal behavior once user leaves special locale

chrome/android/java/src/org/chromium/chrome/browser/locale/LocaleManager.java

Index: chrome/android/java/src/org/chromium/chrome/browser/locale/LocaleManager.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/locale/LocaleManager.java b/chrome/android/java/src/org/chromium/chrome/browser/locale/LocaleManager.java
index 39c012ac79ee1c9b8c1e832890493d98343e64d9..fbb2897d1f6ffa99fe9709650e2c2e7c4f161e91 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/locale/LocaleManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/locale/LocaleManager.java
@@ -17,6 +17,7 @@ import org.chromium.chrome.browser.ChromeFeatureList;
  */
 public class LocaleManager {
     public static final String PREF_PROMO_SHOWN = "LocaleManager_PREF_PROMO_SHOWN";
+    public static final String PREF_WAS_IN_SPECIAL_LOCALE = "LocaleManager_WAS_IN_SPECIAL_LOCALE";
     public static final String SPECIAL_LOCALE_ID = "US";
 
     private static LocaleManager sInstance;
@@ -24,6 +25,16 @@ public class LocaleManager {
     private SpecialLocaleHandler mLocaleHandler;
 
     /**
+     * Starts listening to state changes of the phone.
+     */
+    public void startObservingPhoneChanges() {}
+
+    /**
+     * Stops listening to state changes of the phone.
+     */
+    public void stopObservingPhoneChanges() {}
+
+    /**
      * @return An instance of the {@link LocaleManager}. This should only be called on UI thread.
      */
     public static LocaleManager getInstance() {
@@ -49,7 +60,10 @@ public class LocaleManager {
             return false;
         }
         boolean inSpecialLocale = ChromeFeatureList.isEnabled("SpecialLocale");
-        return isReallyInSpecialLocale(inSpecialLocale);
+        inSpecialLocale = isReallyInSpecialLocale(inSpecialLocale);
+        ContextUtils.getAppSharedPreferences().edit()
+                .putBoolean(PREF_WAS_IN_SPECIAL_LOCALE, inSpecialLocale).apply();
+        return inSpecialLocale;
     }
 
     /**
@@ -63,7 +77,6 @@ public class LocaleManager {
      * Adds local search engines for special locale.
      */
     public void addSpecialSearchEngines() {
-        // TODO(ianwen): Let this method be called in ChromeActivity#finishNativeInitialization().
         if (!isSpecialLocaleEnabled()) return;
         getSpecialLocaleHandler().loadTemplateUrls();
     }
@@ -82,7 +95,6 @@ public class LocaleManager {
      * Removes local search engines for special locale.
      */
     public void removeSpecialSearchEngines() {
-        // TODO(ianwen): Let this method be called when device configuration changes.
         if (isSpecialLocaleEnabled()) return;
         getSpecialLocaleHandler().removeTemplateUrls();
     }