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

components/autofill/core/browser/personal_data_manager_mac.mm

 // 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/personal_data_manager.h"
 
 #include <math.h>
 
 #import <AddressBook/AddressBook.h>
 
 #include "base/format_macros.h"
 #include "base/guid.h"
 #include "base/logging.h"
 #import "base/mac/scoped_nsexception_enabler.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/sys_string_conversions.h"
 #include "components/autofill/core/browser/autofill_country.h"
 #include "components/autofill/core/browser/autofill_profile.h"
+#include "components/autofill/core/browser/autofill_type.h"
 #include "components/autofill/core/browser/phone_number.h"
 #include "grit/component_strings.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 
 namespace autofill {
 namespace {
 
 const char kAddressBookOrigin[] = "OS X Address Book";
 
 // This implementation makes use of the Address Book API.  Profiles are
@@ skipping 165 matching lines @@
   if (NSString* city = [address objectForKey:kABAddressCityKey])
     profile->SetRawInfo(ADDRESS_HOME_CITY, base::SysNSStringToUTF16(city));
 
   if (NSString* state = [address objectForKey:kABAddressStateKey])
     profile->SetRawInfo(ADDRESS_HOME_STATE, base::SysNSStringToUTF16(state));
 
   if (NSString* zip = [address objectForKey:kABAddressZIPKey])
     profile->SetRawInfo(ADDRESS_HOME_ZIP, base::SysNSStringToUTF16(zip));
 
   if (NSString* country = [address objectForKey:kABAddressCountryKey]) {
-    profile->SetInfo(ADDRESS_HOME_COUNTRY,
+    profile->SetInfo(AutofillType(ADDRESS_HOME_COUNTRY),
                      base::SysNSStringToUTF16(country),
                      app_locale);
   }
 }
 
 // Fills in email address matching current address label.  Note that there may
 // be multiple matching email addresses for a given label.  We take the
 // first we find (topmost) as preferred.
 void AuxiliaryProfilesImpl::GetAddressBookEmail(
     ABPerson* me,
@@ skipping 46 matching lines @@
 
 }  // namespace
 
 // Populate |auxiliary_profiles_| with the Address Book data.
 void PersonalDataManager::LoadAuxiliaryProfiles() {
   AuxiliaryProfilesImpl impl(&auxiliary_profiles_);
   impl.GetAddressBookMeCard(app_locale_);
 }
 
 }  // namespace autofill