Fixed hasty language selection in GetCorrespondingSpellCheckLanguage

chrome/common/spellcheck_common.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/common/spellcheck_common.h"
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/macros.h"
@@ skipping 122 matching lines @@
       versioned_bdict_file_name =
           language + special_version_string[i].version + ".bdic";
       break;
     }
   }
 
   return dict_dir.AppendASCII(versioned_bdict_file_name);
 }
 
 std::string GetCorrespondingSpellCheckLanguage(const std::string& language) {
+  std::string best_match;
   // Look for exact match in the Spell Check language list.
   for (size_t i = 0; i < arraysize(g_supported_spellchecker_languages);
        ++i) {
     // First look for exact match in the language region of the list.
     std::string spellcheck_language(
         g_supported_spellchecker_languages[i].language);
     if (spellcheck_language == language)
       return language;
 
     // Next, look for exact match in the language_region part of the list.
     std::string spellcheck_language_region(
         g_supported_spellchecker_languages[i].language_region);
-    if (spellcheck_language_region == language)
-      return g_supported_spellchecker_languages[i].language;
+    if (spellcheck_language_region == language) {
+      if (best_match.empty())
+        best_match = g_supported_spellchecker_languages[i].language;

[please use gerrit instead, 2016/05/02 18:02:28]

If we're switching from returning the first element to returning the last
matching element, would be simpler to change the order in
g_supported_spellchecker_languages instead?

[Kevin Bailey, 2016/05/02 18:20:45]

The other functions depend on the current order. I'm not sure why you'd want to
do that.

+    }
   }
 
-  // No match found - return blank.
-  return std::string();
+  // No match found - return best match, if any.
+  return best_match;

[please use gerrit instead, 2016/05/02 18:02:28]

Add a test case for blank best match.

[Kevin Bailey, 2016/05/02 18:20:45]

I assume there already is one, since this is not new behavior, but since it's
one line, I added one to the same file.

 }
 
 void SpellCheckLanguages(std::vector<std::string>* languages) {
   for (size_t i = 0; i < arraysize(g_supported_spellchecker_languages);
        ++i) {
     languages->push_back(g_supported_spellchecker_languages[i].language);
   }
 }
 
 void GetISOLanguageCountryCodeFromLocale(const std::string& locale,
@@ skipping 10 matching lines @@
     error = U_ZERO_ERROR;
     uloc_getLanguage(id, language, arraysize(language), &error);
     country = uloc_getISO3Country(id);
   }
   *language_code = std::string(language);
   *country_code = std::string(country);
 }
 
 }  // namespace spellcheck_common
 }  // namespace chrome