Cleanup special locale handling for Chrome.

This can be handled w/o a server side config now.

BUG=918895

Change-Id: I47393da7efd42259f170e19f37a4feee24fc83b0
Reviewed-on: https://chromium-review.googlesource.com/c/1394863Reviewed-by: Yusuf Ozuysal <yusufo@chromium.org>
Commit-Queue: Ted Choc <tedchoc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#619983}

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

@@ -147,13 +147,7 @@ public class LocaleManager {
      * @return Whether the Chrome instance is running in a special locale.
      */
     public boolean isSpecialLocaleEnabled() {
-        // If there is a kill switch sent from the server, disable the feature.
-        if (!ChromeFeatureList.isEnabled("SpecialLocaleWrapper")) {
-            return false;
-        }
-        boolean inSpecialLocale = ChromeFeatureList.isEnabled("SpecialLocale");
-        inSpecialLocale = isReallyInSpecialLocale(inSpecialLocale);
-        return inSpecialLocale;
+        return false;
     }
 
     /**
@@ -378,15 +372,6 @@ public class LocaleManager {
         manager.showSnackbar(snackbar);
     }
 
-    /**
-     * Does some extra checking about whether the user is in special locale.
-     * @param inSpecialLocale Whether the variation service thinks the client is in special locale.
-     * @return The result after extra confirmation.
-     */
-    protected boolean isReallyInSpecialLocale(boolean inSpecialLocale) {
-        return inSpecialLocale;
-    }
-
     /**
      * @return Whether and which search engine promo should be shown.
      */

chrome/browser/about_flags.cc

@@ -1862,9 +1862,6 @@ const FeatureEntry kFeatureEntries[] = {
      SINGLE_VALUE_TYPE(app_list::switches::kResetAppListInstallState)},
 #endif  // BUILDFLAG(ENABLE_APP_LIST)
 #if defined(OS_ANDROID)
-    {"enable-special-locale", flag_descriptions::kEnableSpecialLocaleName,
-     flag_descriptions::kEnableSpecialLocaleDescription, kOsAndroid,
-     FEATURE_VALUE_TYPE(chrome::android::kSpecialLocaleFeature)},
     {"enable-accessibility-tab-switcher",
      flag_descriptions::kAccessibilityTabSwitcherName,
      flag_descriptions::kAccessibilityTabSwitcherDescription, kOsAndroid,

chrome/browser/android/chrome_feature_list.cc

@@ -142,7 +142,6 @@ const base::Feature* kFeaturesExposedToJava[] = {
     &kServiceManagerForDownload,
     &kSoleIntegration,
     &kSpannableInlineAutocomplete,
-    &kSpecialLocaleFeature,
     &kSpecialLocaleWrapper,
     &kTabReparenting,
     &kTabSwitcherOnReturn,
@@ -398,9 +397,6 @@ const base::Feature kSoleIntegration{"SoleIntegration",
 const base::Feature kSpannableInlineAutocomplete{
     "SpannableInlineAutocomplete", base::FEATURE_ENABLED_BY_DEFAULT};
 
-const base::Feature kSpecialLocaleFeature{"SpecialLocale",
-                                          base::FEATURE_DISABLED_BY_DEFAULT};
-
 const base::Feature kSpecialLocaleWrapper{"SpecialLocaleWrapper",
                                           base::FEATURE_ENABLED_BY_DEFAULT};
 

chrome/browser/android/chrome_feature_list.h

@@ -78,7 +78,6 @@ extern const base::Feature kSearchReadyOmniboxFeature;
 extern const base::Feature kServiceManagerForDownload;
 extern const base::Feature kSoleIntegration;
 extern const base::Feature kSpannableInlineAutocomplete;
-extern const base::Feature kSpecialLocaleFeature;
 extern const base::Feature kSpecialLocaleWrapper;
 extern const base::Feature kTabReparenting;
 extern const base::Feature kTabSwitcherOnReturn;

chrome/browser/flag_descriptions.cc

@@ -2399,12 +2399,6 @@ const char kEnableOskOverscrollDescription[] =
     "Enable OSK overscroll support. With this flag on, the OSK will only "
     "resize the visual viewport.";
 
-const char kEnableSpecialLocaleName[] =
-    "Enable custom logic for special locales.";
-const char kEnableSpecialLocaleDescription[] =
-    "Enable custom logic for special locales. In this mode, Chrome might "
-    "behave differently in some locales.";
-
 const char kEnableWebNfcName[] = "WebNFC";
 const char kEnableWebNfcDescription[] = "Enable WebNFC support.";
 

chrome/browser/flag_descriptions.h

@@ -1430,9 +1430,6 @@ extern const char kEnableOfflinePreviewsDescription[];
 extern const char kEnableOskOverscrollName[];
 extern const char kEnableOskOverscrollDescription[];
 
-extern const char kEnableSpecialLocaleName[];
-extern const char kEnableSpecialLocaleDescription[];
-
 extern const char kEnableWebNfcName[];
 extern const char kEnableWebNfcDescription[];