[Autofill] Distinguish between native field types and potentially HTML field types.

components/autofill/core/browser/webdata/autofill_table.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 "components/autofill/core/browser/webdata/autofill_table.h"
 
 #include <algorithm>
 #include <limits>
 #include <map>
 #include <set>
@@ skipping 54 matching lines @@
   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);
+  text = profile.GetInfo(AutofillType(ADDRESS_HOME_COUNTRY), app_locale);
   s->BindString16(7, LimitDataSize(text));
   text = profile.GetRawInfo(ADDRESS_HOME_COUNTRY);
   s->BindString16(8, LimitDataSize(text));
   s->BindInt64(9, Time::Now().ToTimeT());
   s->BindString(10, profile.origin());
 }
 
 AutofillProfile* AutofillProfileFromStatement(const sql::Statement& s,
                                               const std::string& app_locale) {
   AutofillProfile* profile = new AutofillProfile;
@@ skipping 1835 matching lines @@
       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.SetInfo(ADDRESS_HOME_COUNTRY, s.ColumnString16(11), app_locale_);
+      profile.SetInfo(AutofillType(ADDRESS_HOME_COUNTRY), s.ColumnString16(11),
+                      app_locale_);
       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 202 matching lines @@
     text = iter->GetRawInfo(ADDRESS_HOME_LINE1);
     s.BindString16(2, LimitDataSize(text));
     text = iter->GetRawInfo(ADDRESS_HOME_LINE2);
     s.BindString16(3, LimitDataSize(text));
     text = iter->GetRawInfo(ADDRESS_HOME_CITY);
     s.BindString16(4, LimitDataSize(text));
     text = iter->GetRawInfo(ADDRESS_HOME_STATE);
     s.BindString16(5, LimitDataSize(text));
     text = iter->GetRawInfo(ADDRESS_HOME_ZIP);
     s.BindString16(6, LimitDataSize(text));
-    text = iter->GetInfo(ADDRESS_HOME_COUNTRY, app_locale_);
+    text = iter->GetInfo(AutofillType(ADDRESS_HOME_COUNTRY), app_locale_);
     s.BindString16(7, LimitDataSize(text));
     text = iter->GetRawInfo(ADDRESS_HOME_COUNTRY);
     s.BindString16(8, LimitDataSize(text));
     s.BindInt64(9, date_item->second);
 
     if (!s.Run())
       return false;
 
     if (!AddAutofillProfilePieces(*iter, db_))
       return false;
@@ skipping 18 matching lines @@
   if (!db_->DoesColumnExist("credit_cards", "origin") &&
       !db_->Execute("ALTER TABLE credit_cards "
                     "ADD COLUMN origin VARCHAR DEFAULT ''")) {
       return false;
   }
 
   return transaction.Commit();
 }
 
 }  // namespace autofill