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

chrome/browser/autofill/address_unittest.cc

 // Copyright (c) 2011 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 <string>
 
 #include "base/message_loop.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autofill/address.h"
@@ skipping 27 matching lines @@
   address.set_country_code("CA");
   EXPECT_EQ("CA", address.country_code());
 }
 
 // Test that country codes are properly decoded as country names.
 TEST_F(AddressTest, GetCountry) {
   Address address;
   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);
 }
 
 // Test that we properly detect country codes appropriate for each country.
 TEST_F(AddressTest, SetCountry) {
   Address address;
   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);
 }
 
 // Test that we properly match typed values to stored country data.
 TEST_F(AddressTest, IsCountry) {
   Address address;
   address.set_country_code("US");
 
   const char* const kValidMatches[] = {
@@ skipping 23 matching lines @@
     EXPECT_EQ(0U, matching_types.size());
   }
 
   // Make sure that garbage values don't match when the country code is empty.
   address.set_country_code("");
   EXPECT_EQ(std::string(), address.country_code());
   FieldTypeSet matching_types;
   address.GetMatchingTypes(ASCIIToUTF16("Garbage"), "US", &matching_types);
   EXPECT_EQ(0U, matching_types.size());
 }