[Autofill] Fixed bug in localized country names cache

Change-Id: Ic1f755bb69a5f1313ed702906b673ed959942cc6
Bug: 1113955
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2340970Reviewed-by: Christoph Schwering <schwering@google.com>
Commit-Queue: Matthias Körber <koerber@google.com>
Cr-Commit-Position: refs/heads/master@{#795754}

components/autofill/core/browser/geo/country_names.cc

@@ -130,7 +130,8 @@ const std::string CountryNames::GetCountryCodeForLocalizedCountryName(
   result = country_names_for_locale.GetCountryCode(country);
 
   // Put the country names for the locale into the cache.
-  localized_country_names_cache_.Put(locale_name, std::move(result));
+  localized_country_names_cache_.Put(locale_name,
+                                     std::move(country_names_for_locale));
 
   return result;
 }

components/autofill/core/browser/geo/country_names_unittest.cc

@@ -72,6 +72,9 @@ TEST(CountryNamesTest, GetCountryCode_EnUsFallback) {
 TEST(CountryNamesTest, GetCountryCodeForLocalizedCountryName) {
   // Initialize with the default locale.
   TestCountryNames names("en_US");
+  EXPECT_EQ("AM", names.GetCountryCodeForLocalizedCountryName(
+                      ASCIIToUTF16("Armenien"), "de"));
+  // Check that there is no cache by requesting the same result twice.
   EXPECT_EQ("AM", names.GetCountryCodeForLocalizedCountryName(
                       ASCIIToUTF16("Armenien"), "de"));
   EXPECT_EQ("AZ", names.GetCountryCodeForLocalizedCountryName(