Fixed hasty language selection in GetCorrespondingSpellCheckLanguage

chrome/common/spellcheck_common.cc

Index: chrome/common/spellcheck_common.cc
diff --git a/chrome/common/spellcheck_common.cc b/chrome/common/spellcheck_common.cc
index 58c334674b9ab331584d0b08c86eaa3d560d0e25..a539a117eb37b0f076d00c3fc823ee9fdd8a781f 100644
--- a/chrome/common/spellcheck_common.cc
+++ b/chrome/common/spellcheck_common.cc
@@ -140,6 +140,7 @@ base::FilePath GetVersionedFileName(const std::string& input_language,
 }
 
 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) {
@@ -152,12 +153,14 @@ std::string GetCorrespondingSpellCheckLanguage(const std::string& 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) {