Make autofill's Address store country using the country code so that app locale isn't needed for th…

components/autofill/browser/android/auxiliary_profile_unittest_android.cc

 // Copyright 2013 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 "base/memory/scoped_vector.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
 #include "components/autofill/browser/android/auxiliary_profile_loader_android.h"
 #include "components/autofill/browser/android/auxiliary_profiles_android.h"
 #include "components/autofill/browser/android/test_auxiliary_profile_loader_android.h"
 #include "components/autofill/browser/autofill_profile.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class AuxiliaryProfileAndroidTest : public testing::Test {
  public:
   AuxiliaryProfileAndroidTest() {}
 
   AutofillProfile* GetAndLoadProfile() {
-    autofill::AuxiliaryProfilesAndroid impl(profile_loader_);
+    autofill::AuxiliaryProfilesAndroid impl(profile_loader_, "en-US");
     profile_ = impl.LoadContactsProfile();
     return profile_.get();
   }
 
   TestAuxiliaryProfileLoader& profile_loader() {
     return profile_loader_;
   }
 
  private:
   TestAuxiliaryProfileLoader profile_loader_;
@@ skipping 72 matching lines @@
 // Disable address population tests until we implement a way to parse the
 // data.
 //
 
 #if 0
 TEST_F(AuxiliaryProfileAndroidTest, SetAddressInfo) {
   string16 street = ASCIIToUTF16("221 B Baker Street");
   string16 city = ASCIIToUTF16("London");
   string16 postal_code = ASCIIToUTF16("123456");
   string16 region = ASCIIToUTF16("Georgian Terrace");
-  string16 country = ASCIIToUTF16("England");
+  string16 country = ASCIIToUTF16("GB");

[Ilya Sherman, 2013/04/05 05:18:01]

Please preserve the string "England" here -- this should continue to work.

[jam, 2013/04/05 06:45:54]

Done.

 
   profile_loader().SetStreet(street);
   profile_loader().SetCity(city);
   profile_loader().SetPostalCode(postal_code);
   profile_loader().SetRegion(region);
   profile_loader().SetCountry(country);
 
   AutofillProfile* profile = GetAndLoadProfile();
   EXPECT_EQ(profile->GetRawInfo(ADDRESS_HOME_LINE1), street);
   EXPECT_EQ(profile->GetRawInfo(ADDRESS_HOME_CITY), city);
@@ skipping 27 matching lines @@
 TEST_F(AuxiliaryProfileAndroidTest, SetAddressInfoEmpty) {
   AutofillProfile* profile = GetAndLoadProfile();
   EXPECT_EQ(profile->GetRawInfo(ADDRESS_HOME_LINE1), string16());
   EXPECT_EQ(profile->GetRawInfo(ADDRESS_HOME_LINE2), string16());
   EXPECT_EQ(profile->GetRawInfo(ADDRESS_HOME_CITY), string16());
   EXPECT_EQ(profile->GetRawInfo(ADDRESS_HOME_ZIP), string16());
   EXPECT_EQ(profile->GetRawInfo(ADDRESS_HOME_STATE), string16());
   EXPECT_EQ(profile->GetRawInfo(ADDRESS_HOME_COUNTRY), string16());
 }
 #endif