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

components/webdata/common/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/message_loop.h"
@@ skipping 42 matching lines @@
   profile->SetRawInfo(autofill::NAME_MIDDLE, s.ColumnString16(3));
   profile->SetRawInfo(autofill::NAME_LAST, s.ColumnString16(4));
   profile->SetRawInfo(autofill::EMAIL_ADDRESS, s.ColumnString16(5));
   profile->SetRawInfo(autofill::COMPANY_NAME, s.ColumnString16(6));
   profile->SetRawInfo(autofill::ADDRESS_HOME_LINE1, s.ColumnString16(7));
   profile->SetRawInfo(autofill::ADDRESS_HOME_LINE2, s.ColumnString16(8));
   profile->SetRawInfo(autofill::ADDRESS_HOME_CITY, s.ColumnString16(9));
   profile->SetRawInfo(autofill::ADDRESS_HOME_STATE, s.ColumnString16(10));
   profile->SetRawInfo(autofill::ADDRESS_HOME_ZIP, s.ColumnString16(11));
   profile->SetInfo(
-      autofill::ADDRESS_HOME_COUNTRY, s.ColumnString16(12), "en-US");
+      autofill::AutofillType(autofill::ADDRESS_HOME_COUNTRY),
+      s.ColumnString16(12), "en-US");
   profile->SetRawInfo(autofill::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(autofill::COMPANY_NAME, s.ColumnString16(1));
   profile->SetRawInfo(autofill::ADDRESS_HOME_LINE1, s.ColumnString16(2));
   profile->SetRawInfo(autofill::ADDRESS_HOME_LINE2, s.ColumnString16(3));
   profile->SetRawInfo(autofill::ADDRESS_HOME_CITY, s.ColumnString16(4));
   profile->SetRawInfo(autofill::ADDRESS_HOME_STATE, s.ColumnString16(5));
   profile->SetRawInfo(autofill::ADDRESS_HOME_ZIP, s.ColumnString16(6));
   profile->SetInfo(
-      autofill::ADDRESS_HOME_COUNTRY, s.ColumnString16(7), "en-US");
+      autofill::AutofillType(autofill::ADDRESS_HOME_COUNTRY),
+      s.ColumnString16(7), "en-US");
   *date_modified = s.ColumnInt64(8);
 }
 
 void CreditCard31FromStatement(const sql::Statement& s,
                               CreditCard* credit_card,
                               base::string16* label,
                               int* unique_id,
                               std::string* encrypted_number,
                               int64* date_modified) {
   DCHECK(credit_card);
@@ skipping 1976 matching lines @@
     EXPECT_TRUE(connection.DoesColumnExist("keywords",
                                            "search_url_post_params"));
     EXPECT_TRUE(connection.DoesColumnExist("keywords",
                                            "suggest_url_post_params"));
     EXPECT_TRUE(connection.DoesColumnExist("keywords",
                                            "instant_url_post_params"));
     EXPECT_TRUE(connection.DoesColumnExist("keywords",
                                            "image_url_post_params"));
   }
 }