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

components/webdata/autofill/autofill_table.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 "components/webdata/autofill/autofill_table.h"
 
 #include <algorithm>
 #include <limits>
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/guid.h"
 #include "base/i18n/case_conversion.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/time.h"
 #include "base/tuple.h"
+#include "base/utf_string_conversions.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/autofill/browser/personal_data_manager.h"
 #include "components/autofill/common/form_field_data.h"
 #include "components/webdata/autofill/autofill_change.h"
 #include "components/webdata/autofill/autofill_entry.h"
 #include "components/webdata/common/web_database.h"
 #include "components/webdata/encryptor/encryptor.h"
@@ skipping 14 matching lines @@
 }
 
 string16 LimitDataSize(const string16& data) {
   if (data.size() > AutofillTable::kMaxDataLength)
     return data.substr(0, AutofillTable::kMaxDataLength);
 
   return data;
 }
 
 void BindAutofillProfileToStatement(const AutofillProfile& profile,
-                                    sql::Statement* s) {
+                                    sql::Statement* s,
+                                    const std::string& app_locale) {
   DCHECK(base::IsValidGUID(profile.guid()));
   s->BindString(0, profile.guid());
 
   string16 text = profile.GetRawInfo(COMPANY_NAME);
   s->BindString16(1, LimitDataSize(text));
   text = profile.GetRawInfo(ADDRESS_HOME_LINE1);
   s->BindString16(2, LimitDataSize(text));
   text = profile.GetRawInfo(ADDRESS_HOME_LINE2);
   s->BindString16(3, LimitDataSize(text));
   text = profile.GetRawInfo(ADDRESS_HOME_CITY);
   s->BindString16(4, LimitDataSize(text));
   text = profile.GetRawInfo(ADDRESS_HOME_STATE);
   s->BindString16(5, LimitDataSize(text));
   text = profile.GetRawInfo(ADDRESS_HOME_ZIP);
   s->BindString16(6, LimitDataSize(text));
+  text = profile.GetInfo(ADDRESS_HOME_COUNTRY, app_locale);
+  s->BindString16(7, LimitDataSize(text));
   text = profile.GetRawInfo(ADDRESS_HOME_COUNTRY);
-  s->BindString16(7, LimitDataSize(text));
-  std::string country_code = profile.CountryCode();
-  s->BindString(8, country_code);
+  s->BindString16(8, LimitDataSize(text));
   s->BindInt64(9, Time::Now().ToTimeT());
 }
 
-AutofillProfile* AutofillProfileFromStatement(const sql::Statement& s) {
+AutofillProfile* AutofillProfileFromStatement(const sql::Statement& s,
+                                              const std::string& app_locale) {
   AutofillProfile* profile = new AutofillProfile;
   profile->set_guid(s.ColumnString(0));
   DCHECK(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));
   // Intentionally skip column 7, which stores the localized country name.
-  profile->SetCountryCode(s.ColumnString(8));
+  string16 country_code = s.ColumnString16(8);
+  if (country_code.empty()) {
+    // Old versions put the localized country name in column 7.

[jam, 2013/04/05 02:27:26]

This is the first time I look at the webdata code. should this instead be a
database migration to a new version?

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

We should be able to just keep this code as it was.  The migration code in
MigrateToVersion34ProfilesBasedOnCountryCode() should have already taken care of
ensuring that this field is populated correctly.

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

Done.

+    country_code = ASCIIToUTF16(AutofillCountry::GetCountryCode(
+      s.ColumnString16(7), app_locale));
+  }
+  profile->SetRawInfo(ADDRESS_HOME_COUNTRY, country_code);
   // Intentionally skip column 9, which stores the profile's modification date.
 
   return profile;
 }
 
 void BindCreditCardToStatement(const CreditCard& credit_card,
                                sql::Statement* s) {
   DCHECK(base::IsValidGUID(credit_card.guid()));
   s->BindString(0, credit_card.guid());
 
@@ skipping 826 matching lines @@
 
 bool AutofillTable::AddAutofillProfile(const AutofillProfile& profile) {
   if (IsAutofillGUIDInTrash(profile.guid()))
     return true;
 
   sql::Statement s(db_->GetUniqueStatement(
       "INSERT INTO autofill_profiles"
       "(guid, company_name, address_line_1, address_line_2, city, state,"
       " zipcode, country, country_code, date_modified)"
       "VALUES (?,?,?,?,?,?,?,?,?,?)"));
-  BindAutofillProfileToStatement(profile, &s);
+  BindAutofillProfileToStatement(profile, &s, app_locale_);
 
   if (!s.Run())
     return false;
 
   return AddAutofillProfilePieces(profile, db_);
 }
 
 bool AutofillTable::GetAutofillProfile(const std::string& guid,
                                        AutofillProfile** profile) {
   DCHECK(base::IsValidGUID(guid));
   DCHECK(profile);
   sql::Statement s(db_->GetUniqueStatement(
       "SELECT guid, company_name, address_line_1, address_line_2, city, state,"
       " zipcode, country, country_code, date_modified "
       "FROM autofill_profiles "
       "WHERE guid=?"));
   s.BindString(0, guid);
 
   if (!s.Step())
     return false;
 
-  scoped_ptr<AutofillProfile> p(AutofillProfileFromStatement(s));
+  scoped_ptr<AutofillProfile> p(AutofillProfileFromStatement(s, app_locale_));
 
   // Get associated name info.
   AddAutofillProfileNamesToProfile(db_, p.get());
 
   // Get associated email info.
   AddAutofillProfileEmailsToProfile(db_, p.get());
 
   // Get associated phone info.
   AddAutofillProfilePhonesToProfile(db_, p.get());
 
@@ skipping 72 matching lines @@
   scoped_ptr<AutofillProfile> old_profile(tmp_profile);
   if (old_profile->Compare(profile) == 0)
     return true;
 
   sql::Statement s(db_->GetUniqueStatement(
       "UPDATE autofill_profiles "
       "SET guid=?, company_name=?, address_line_1=?, address_line_2=?, "
       "    city=?, state=?, zipcode=?, country=?, country_code=?, "
       "    date_modified=? "
       "WHERE guid=?"));
-  BindAutofillProfileToStatement(profile, &s);
+  BindAutofillProfileToStatement(profile, &s, app_locale_);
   s.BindString(10, profile.guid());
 
   bool result = s.Run();
   DCHECK_GT(db_->GetLastChangeCount(), 0);
   if (!result)
     return result;
 
   // Remove the old names, emails, and phone numbers.
   if (!RemoveAutofillProfilePieces(profile.guid(), db_))
     return false;
@@ skipping 690 matching lines @@
                       "middle_name VARCHAR, "
                       "last_name VARCHAR, "
                       "email VARCHAR, "
                       "company_name VARCHAR, "
                       "address_line_1 VARCHAR, "
                       "address_line_2 VARCHAR, "
                       "city VARCHAR, "
                       "state VARCHAR, "
                       "zipcode VARCHAR, "
                       "country VARCHAR, "
+                      "country_code VARCHAR, "

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

You shouldn't change this migration code.  The semantics of the migration code
are expected to be frozen.

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

Done.

                       "phone VARCHAR, "
                       "date_modified INTEGER NOT NULL DEFAULT 0)")) {
       return false;
     }
 
     if (!db_->Execute(
         "INSERT INTO autofill_profiles_temp "
         "SELECT guid, label, first_name, middle_name, last_name, email, "
         "company_name, address_line_1, address_line_2, city, state, "
-        "zipcode, country, phone, date_modified "
+        "zipcode, country, country, phone, date_modified "

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

Ditto.

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

Done.

         "FROM autofill_profiles")) {
       return false;
     }
 
     if (!db_->Execute("DROP TABLE autofill_profiles"))
       return false;
 
     if (!db_->Execute(
         "ALTER TABLE autofill_profiles_temp RENAME TO autofill_profiles")) {
       return false;
@@ skipping 40 matching lines @@
     if (!db_->DoesTableExist("autofill_profiles_temp")) {
       if (!db_->Execute("CREATE TABLE autofill_profiles_temp ( "
                         "guid VARCHAR PRIMARY KEY, "
                         "company_name VARCHAR, "
                         "address_line_1 VARCHAR, "
                         "address_line_2 VARCHAR, "
                         "city VARCHAR, "
                         "state VARCHAR, "
                         "zipcode VARCHAR, "
                         "country VARCHAR, "
+                        "country_code VARCHAR, "

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

Ditto.

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

Done.

                         "date_modified INTEGER NOT NULL DEFAULT 0)")) {
         return false;
       }
     }
 
     sql::Statement s(db_->GetUniqueStatement(
         "SELECT guid, first_name, middle_name, last_name, email, "
         "company_name, address_line_1, address_line_2, city, state, "
         "zipcode, country, phone, date_modified "
         "FROM autofill_profiles"));
 
     while (s.Step()) {
       AutofillProfile profile;
       profile.set_guid(s.ColumnString(0));
       DCHECK(base::IsValidGUID(profile.guid()));
 
       profile.SetRawInfo(NAME_FIRST, s.ColumnString16(1));
       profile.SetRawInfo(NAME_MIDDLE, s.ColumnString16(2));
       profile.SetRawInfo(NAME_LAST, s.ColumnString16(3));
       profile.SetRawInfo(EMAIL_ADDRESS, s.ColumnString16(4));
       profile.SetRawInfo(COMPANY_NAME, s.ColumnString16(5));
       profile.SetRawInfo(ADDRESS_HOME_LINE1, s.ColumnString16(6));
       profile.SetRawInfo(ADDRESS_HOME_LINE2, s.ColumnString16(7));
       profile.SetRawInfo(ADDRESS_HOME_CITY, s.ColumnString16(8));
       profile.SetRawInfo(ADDRESS_HOME_STATE, s.ColumnString16(9));
       profile.SetRawInfo(ADDRESS_HOME_ZIP, s.ColumnString16(10));
-      profile.SetRawInfo(ADDRESS_HOME_COUNTRY, s.ColumnString16(11));
+      std::string country_code =
+          AutofillCountry::GetCountryCode(s.ColumnString16(11), app_locale_);
+      profile.SetRawInfo(ADDRESS_HOME_COUNTRY, ASCIIToUTF16(country_code));

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

Please call SetInfo() here instead.

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

Done.

       profile.SetRawInfo(PHONE_HOME_WHOLE_NUMBER, s.ColumnString16(12));
       int64 date_modified = s.ColumnInt64(13);
 
       sql::Statement s_insert(db_->GetUniqueStatement(
           "INSERT INTO autofill_profiles_temp"
           "(guid, company_name, address_line_1, address_line_2, city,"
           " state, zipcode, country, date_modified)"
           "VALUES (?,?,?,?,?,?,?,?,?)"));
       s_insert.BindString(0, profile.guid());
       s_insert.BindString16(1, profile.GetRawInfo(COMPANY_NAME));
@@ skipping 169 matching lines @@
         "WHERE guid=?"));
     s_date.BindInt64(0, date_item->second);
     s_date.BindString(1, iter->guid());
 
     if (!s_date.Run())
       return false;
   }
 
   return true;
 }