[Autofill] Update unit tests to use country codes when setting raw address info.

chrome/browser/autofill/address_unittest.cc

Index: chrome/browser/autofill/address_unittest.cc
diff --git a/chrome/browser/autofill/address_unittest.cc b/chrome/browser/autofill/address_unittest.cc
index 9dcda2ab3039530a72666e07ece371004c30b819..f3be2fc757557ddad51bc629f0699436c48988fe 100644
--- a/chrome/browser/autofill/address_unittest.cc
+++ b/chrome/browser/autofill/address_unittest.cc
@@ -45,15 +45,15 @@ TEST_F(AddressTest, GetCountry) {
   EXPECT_EQ(std::string(), address.country_code());
 
   // Make sure that nothing breaks when the country code is missing.
-  string16 country = address.GetRawInfo(ADDRESS_HOME_COUNTRY);
+  string16 country = address.GetInfo(ADDRESS_HOME_COUNTRY, "en-US");
   EXPECT_EQ(string16(), country);
 
   address.set_country_code("US");
-  country = address.GetRawInfo(ADDRESS_HOME_COUNTRY);
+  country = address.GetInfo(ADDRESS_HOME_COUNTRY, "en-US");
   EXPECT_EQ(ASCIIToUTF16("United States"), country);
 
   address.set_country_code("CA");
-  country = address.GetRawInfo(ADDRESS_HOME_COUNTRY);
+  country = address.GetInfo(ADDRESS_HOME_COUNTRY, "en-US");
   EXPECT_EQ(ASCIIToUTF16("Canada"), country);
 }
 
@@ -63,32 +63,32 @@ TEST_F(AddressTest, SetCountry) {
   EXPECT_EQ(std::string(), address.country_code());
 
   // Test basic conversion.
-  address.SetRawInfo(ADDRESS_HOME_COUNTRY, ASCIIToUTF16("United States"));
-  string16 country = address.GetRawInfo(ADDRESS_HOME_COUNTRY);
+  address.SetInfo(ADDRESS_HOME_COUNTRY, ASCIIToUTF16("United States"), "en-US");
+  string16 country = address.GetInfo(ADDRESS_HOME_COUNTRY, "en-US");
   EXPECT_EQ("US", address.country_code());
   EXPECT_EQ(ASCIIToUTF16("United States"), country);
 
   // Test basic synonym detection.
-  address.SetRawInfo(ADDRESS_HOME_COUNTRY, ASCIIToUTF16("USA"));
-  country = address.GetRawInfo(ADDRESS_HOME_COUNTRY);
+  address.SetInfo(ADDRESS_HOME_COUNTRY, ASCIIToUTF16("USA"), "en-US");
+  country = address.GetInfo(ADDRESS_HOME_COUNTRY, "en-US");
   EXPECT_EQ("US", address.country_code());
   EXPECT_EQ(ASCIIToUTF16("United States"), country);
 
   // Test case-insensitivity.
-  address.SetRawInfo(ADDRESS_HOME_COUNTRY, ASCIIToUTF16("canADA"));
-  country = address.GetRawInfo(ADDRESS_HOME_COUNTRY);
+  address.SetInfo(ADDRESS_HOME_COUNTRY, ASCIIToUTF16("canADA"), "en-US");
+  country = address.GetInfo(ADDRESS_HOME_COUNTRY, "en-US");
   EXPECT_EQ("CA", address.country_code());
   EXPECT_EQ(ASCIIToUTF16("Canada"), country);
 
   // Test country code detection.
-  address.SetRawInfo(ADDRESS_HOME_COUNTRY, ASCIIToUTF16("JP"));
-  country = address.GetRawInfo(ADDRESS_HOME_COUNTRY);
+  address.SetInfo(ADDRESS_HOME_COUNTRY, ASCIIToUTF16("JP"), "en-US");
+  country = address.GetInfo(ADDRESS_HOME_COUNTRY, "en-US");
   EXPECT_EQ("JP", address.country_code());
   EXPECT_EQ(ASCIIToUTF16("Japan"), country);
 
   // Test that we ignore unknown countries.
-  address.SetRawInfo(ADDRESS_HOME_COUNTRY, ASCIIToUTF16("Unknown"));
-  country = address.GetRawInfo(ADDRESS_HOME_COUNTRY);
+  address.SetInfo(ADDRESS_HOME_COUNTRY, ASCIIToUTF16("Unknown"), "en-US");
+  country = address.GetInfo(ADDRESS_HOME_COUNTRY, "en-US");
   EXPECT_EQ(std::string(), address.country_code());
   EXPECT_EQ(string16(), country);
 }