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

chrome/browser/webdata/web_database_migration_unittest.cc

 // Copyright (c) 2012 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/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/guid.h"
 #include "base/message_loop.h"
 #include "base/stl_util.h"
 #include "base/string16.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/webdata/keyword_table.h"
 #include "chrome/browser/webdata/logins_table.h"
 #include "chrome/browser/webdata/token_service_table.h"
 #include "chrome/browser/webdata/web_apps_table.h"
 #include "chrome/browser/webdata/web_intents_table.h"
 #include "chrome/test/base/ui_test_utils.h"
+#include "components/autofill/browser/autofill_country.h"
 #include "components/autofill/browser/autofill_profile.h"
 #include "components/autofill/browser/autofill_type.h"
 #include "components/autofill/browser/credit_card.h"
 #include "components/webdata/autofill/autofill_change.h"
 #include "components/webdata/autofill/autofill_entry.h"
 #include "components/webdata/autofill/autofill_table.h"
 #include "components/webdata/common/web_database.h"
 #include "content/public/test/test_browser_thread.h"
 #include "sql/statement.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 17 matching lines @@
   profile->SetRawInfo(NAME_FIRST, s.ColumnString16(2));
   profile->SetRawInfo(NAME_MIDDLE, s.ColumnString16(3));
   profile->SetRawInfo(NAME_LAST, s.ColumnString16(4));
   profile->SetRawInfo(EMAIL_ADDRESS, s.ColumnString16(5));
   profile->SetRawInfo(COMPANY_NAME, s.ColumnString16(6));
   profile->SetRawInfo(ADDRESS_HOME_LINE1, s.ColumnString16(7));
   profile->SetRawInfo(ADDRESS_HOME_LINE2, s.ColumnString16(8));
   profile->SetRawInfo(ADDRESS_HOME_CITY, s.ColumnString16(9));
   profile->SetRawInfo(ADDRESS_HOME_STATE, s.ColumnString16(10));
   profile->SetRawInfo(ADDRESS_HOME_ZIP, s.ColumnString16(11));
-  profile->SetRawInfo(ADDRESS_HOME_COUNTRY, s.ColumnString16(12));
+  profile->SetRawInfo(
+      ADDRESS_HOME_COUNTRY,
+      ASCIIToUTF16(
+          AutofillCountry::GetCountryCode(s.ColumnString16(12), "en-US")));

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

Please use SetInfo() for this.

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

Done.

   profile->SetRawInfo(PHONE_HOME_WHOLE_NUMBER, s.ColumnString16(13));
   *date_modified = s.ColumnInt64(15);
   profile->set_guid(s.ColumnString(16));
   EXPECT_TRUE(base::IsValidGUID(profile->guid()));
 }
 
 void AutofillProfile33FromStatement(const sql::Statement& s,
                                     AutofillProfile* profile,
                                     int64* date_modified) {
   DCHECK(profile);
   DCHECK(date_modified);
   profile->set_guid(s.ColumnString(0));
   EXPECT_TRUE(base::IsValidGUID(profile->guid()));
   profile->SetRawInfo(COMPANY_NAME, s.ColumnString16(1));
   profile->SetRawInfo(ADDRESS_HOME_LINE1, s.ColumnString16(2));
   profile->SetRawInfo(ADDRESS_HOME_LINE2, s.ColumnString16(3));
   profile->SetRawInfo(ADDRESS_HOME_CITY, s.ColumnString16(4));
   profile->SetRawInfo(ADDRESS_HOME_STATE, s.ColumnString16(5));
   profile->SetRawInfo(ADDRESS_HOME_ZIP, s.ColumnString16(6));
-  profile->SetRawInfo(ADDRESS_HOME_COUNTRY, s.ColumnString16(7));
+  profile->SetRawInfo(
+      ADDRESS_HOME_COUNTRY,
+      ASCIIToUTF16(
+          AutofillCountry::GetCountryCode(s.ColumnString16(7), "en-US")));

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

Please use SetInfo() for this.

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

Done.

   *date_modified = s.ColumnInt64(8);
 }
 
 void CreditCard31FromStatement(const sql::Statement& s,
                               CreditCard* credit_card,
                               string16* label,
                               int* unique_id,
                               std::string* encrypted_number,
                               int64* date_modified) {
   DCHECK(credit_card);
@@ skipping 1891 matching lines @@
     ASSERT_TRUE(sql::MetaTable::DoesTableExist(&connection));
 
     // Check version.
     EXPECT_EQ(kCurrentTestedVersionNumber, VersionFromConnection(&connection));
 
     // A new column should have been created.
     EXPECT_TRUE(connection.DoesColumnExist("keywords",
                                            "search_terms_replacement_key"));
   }
 }