Reverted additions to the "well-known conflicting language codes" list.

Even our optimized version of these changes caused multiple performance
regression warnings: crbug.com/780176, crbug.com/780174.

Bug: 765006
Change-Id: I59924ff464a6161cf0afee332f2ceb6c40c7ee0b
Reviewed-on: https://chromium-review.googlesource.com/969681Reviewed-by: Andrew Moylan <amoylan@chromium.org>
Commit-Queue: Michael Martis <martis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#544244}

components/translate/core/language_detection/language_detection_util.cc

@@ -49,12 +49,10 @@ int GetSimilarLanguageGroupCode(const std::string& language) {
 }
 
 // Well-known languages which often have wrong server configuration of
-// Content-Language: en. The list must be sorted alphabatically so
-// they can be binary searched.
+// Content-Language: en.
 const char* const kWellKnownCodesOnWrongConfiguration[] = {
-    "ar", "da", "de", "el", "es", "fa", "fr",    "hi",
-    "hu", "id", "it", "ja", "ms", "nl", "pl",    "pt",
-    "ro", "ru", "sv", "th", "tr", "vi", "zh-CN", "zh-TW"};
+    "es",    "pt", "ja", "ru", "de", "zh-CN",
+    "zh-TW", "ar", "id", "fr", "it", "th"};
 
 // Applies a series of language code modification in proper order.
 void ApplyLanguageCodeCorrection(std::string* code) {
@@ -328,9 +326,11 @@ bool IsSameOrSimilarLanguages(const std::string& page_language,
 }
 
 bool IsServerWrongConfigurationLanguage(const std::string& language_code) {
-  return binary_search(kWellKnownCodesOnWrongConfiguration,
-                       std::end(kWellKnownCodesOnWrongConfiguration),
-                       language_code);
+  for (size_t i = 0; i < arraysize(kWellKnownCodesOnWrongConfiguration); ++i) {
+    if (language_code == kWellKnownCodesOnWrongConfiguration[i])
+      return true;
+  }
+  return false;
 }
 
 bool MaybeServerWrongConfiguration(const std::string& page_language,

components/translate/core/language_detection/language_detection_util_unittest.cc

@@ -178,10 +178,9 @@ TEST_F(LanguageDetectionUtilTest, AdoptHtmlLang) {
 TEST_F(LanguageDetectionUtilTest, IsServerWrongConfigurationLanguage) {
   // These languages should all be identified as having the wrong server
   // configuration.
-  const char* const wrong_languages[] = {
-      "ar", "da", "de", "el", "es", "fa", "fr",    "hi",
-      "hu", "id", "it", "ja", "ms", "nl", "pl",    "pt",
-      "ro", "ru", "sv", "th", "tr", "vi", "zh-CN", "zh-TW"};
+  const char* const wrong_languages[] = {"es", "pt",    "ja",    "ru",
+                                         "de", "zh-CN", "zh-TW", "ar",
+                                         "id", "fr",    "it",    "th"};
   for (const char* const language : wrong_languages) {
     EXPECT_TRUE(translate::IsServerWrongConfigurationLanguage(language));
   }