Index: chrome/browser/autofill/address_unittest.cc |
diff --git a/chrome/browser/autofill/address_unittest.cc b/chrome/browser/autofill/address_unittest.cc |
index 64c7d5fc66500a4e4903fae8105c04e0f04779fa..5f4c8831f57b2db4a8d9dc7bb17cb64d89d10d96 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.GetInfo(ADDRESS_HOME_COUNTRY); |
+ string16 country = address.GetRawInfo(ADDRESS_HOME_COUNTRY); |
EXPECT_EQ(string16(), country); |
address.set_country_code("US"); |
- country = address.GetInfo(ADDRESS_HOME_COUNTRY); |
+ country = address.GetRawInfo(ADDRESS_HOME_COUNTRY); |
EXPECT_EQ(ASCIIToUTF16("United States"), country); |
address.set_country_code("CA"); |
- country = address.GetInfo(ADDRESS_HOME_COUNTRY); |
+ country = address.GetRawInfo(ADDRESS_HOME_COUNTRY); |
EXPECT_EQ(ASCIIToUTF16("Canada"), country); |
} |
@@ -63,32 +63,32 @@ TEST_F(AddressTest, SetCountry) { |
EXPECT_EQ(std::string(), address.country_code()); |
// Test basic conversion. |
- address.SetInfo(ADDRESS_HOME_COUNTRY, ASCIIToUTF16("United States")); |
- string16 country = address.GetInfo(ADDRESS_HOME_COUNTRY); |
+ address.SetRawInfo(ADDRESS_HOME_COUNTRY, ASCIIToUTF16("United States")); |
+ string16 country = address.GetRawInfo(ADDRESS_HOME_COUNTRY); |
EXPECT_EQ("US", address.country_code()); |
EXPECT_EQ(ASCIIToUTF16("United States"), country); |
// Test basic synonym detection. |
- address.SetInfo(ADDRESS_HOME_COUNTRY, ASCIIToUTF16("USA")); |
- country = address.GetInfo(ADDRESS_HOME_COUNTRY); |
+ address.SetRawInfo(ADDRESS_HOME_COUNTRY, ASCIIToUTF16("USA")); |
+ country = address.GetRawInfo(ADDRESS_HOME_COUNTRY); |
EXPECT_EQ("US", address.country_code()); |
EXPECT_EQ(ASCIIToUTF16("United States"), country); |
// Test case-insensitivity. |
- address.SetInfo(ADDRESS_HOME_COUNTRY, ASCIIToUTF16("canADA")); |
- country = address.GetInfo(ADDRESS_HOME_COUNTRY); |
+ address.SetRawInfo(ADDRESS_HOME_COUNTRY, ASCIIToUTF16("canADA")); |
+ country = address.GetRawInfo(ADDRESS_HOME_COUNTRY); |
EXPECT_EQ("CA", address.country_code()); |
EXPECT_EQ(ASCIIToUTF16("Canada"), country); |
// Test country code detection. |
- address.SetInfo(ADDRESS_HOME_COUNTRY, ASCIIToUTF16("JP")); |
- country = address.GetInfo(ADDRESS_HOME_COUNTRY); |
+ address.SetRawInfo(ADDRESS_HOME_COUNTRY, ASCIIToUTF16("JP")); |
+ country = address.GetRawInfo(ADDRESS_HOME_COUNTRY); |
EXPECT_EQ("JP", address.country_code()); |
EXPECT_EQ(ASCIIToUTF16("Japan"), country); |
// Test that we ignore unknown countries. |
- address.SetInfo(ADDRESS_HOME_COUNTRY, ASCIIToUTF16("Unknown")); |
- country = address.GetInfo(ADDRESS_HOME_COUNTRY); |
+ address.SetRawInfo(ADDRESS_HOME_COUNTRY, ASCIIToUTF16("Unknown")); |
+ country = address.GetRawInfo(ADDRESS_HOME_COUNTRY); |
EXPECT_EQ(std::string(), address.country_code()); |
EXPECT_EQ(string16(), country); |
} |