Add a data-driven unit test to validate autofill profile merging during aggregation.

chrome/browser/autofill/autofill_type.cc

Index: chrome/browser/autofill/autofill_type.cc
diff --git a/chrome/browser/autofill/autofill_type.cc b/chrome/browser/autofill/autofill_type.cc
index 972cd57dc4bf09098ca1d9ccc31dc6451b70bb48..69485aa6ade496db9fbb5ea1dfb90d1e38b86866 100644
--- a/chrome/browser/autofill/autofill_type.cc
+++ b/chrome/browser/autofill/autofill_type.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/autofill/autofill_type.h"
 
 #include "base/basictypes.h"
+#include "base/logging.h"
 
 namespace {
 
@@ -200,3 +201,194 @@ AutoFillFieldType AutoFillType::GetEquivalentFieldType(
   }
 }
 
+// static
+std::string AutoFillType::FieldTypeToString(AutoFillFieldType type) {
+  switch (type) {
+    case NO_SERVER_DATA:
+      return "NO_SERVER_DATA";
+    case UNKNOWN_TYPE:
+      return "UNKNOWN_TYPE";
+    case EMPTY_TYPE:
+      return "EMPTY_TYPE";
+    case NAME_FIRST:
+      return "NAME_FIRST";
+    case NAME_MIDDLE:
+      return "NAME_MIDDLE";
+    case NAME_LAST:
+      return "NAME_LAST";
+    case NAME_MIDDLE_INITIAL:
+      return "NAME_MIDDLE_INITIAL";
+    case NAME_FULL:
+      return "NAME_FULL";
+    case NAME_SUFFIX:
+      return "NAME_SUFFIX";
+    case EMAIL_ADDRESS:
+      return "EMAIL_ADDRESS";
+    case PHONE_HOME_NUMBER:
+      return "PHONE_HOME_NUMBER";
+    case PHONE_HOME_CITY_CODE:
+      return "PHONE_HOME_CITY_CODE";
+    case PHONE_HOME_COUNTRY_CODE:
+      return "PHONE_HOME_COUNTRY_CODE";
+    case PHONE_HOME_CITY_AND_NUMBER:
+      return "PHONE_HOME_CITY_AND_NUMBER";
+    case PHONE_HOME_WHOLE_NUMBER:
+      return "PHONE_HOME_WHOLE_NUMBER";
+    case PHONE_FAX_NUMBER:
+      return "PHONE_FAX_NUMBER";
+    case PHONE_FAX_CITY_CODE:
+      return "PHONE_FAX_CITY_CODE";
+    case PHONE_FAX_COUNTRY_CODE:
+      return "PHONE_FAX_COUNTRY_CODE";
+    case PHONE_FAX_CITY_AND_NUMBER:
+      return "PHONE_FAX_CITY_AND_NUMBER";
+    case PHONE_FAX_WHOLE_NUMBER:
+      return "PHONE_FAX_WHOLE_NUMBER";
+    case ADDRESS_HOME_LINE1:
+      return "ADDRESS_HOME_LINE1";
+    case ADDRESS_HOME_LINE2:
+      return "ADDRESS_HOME_LINE2";
+    case ADDRESS_HOME_APT_NUM:
+      return "ADDRESS_HOME_APT_NUM";
+    case ADDRESS_HOME_CITY:
+      return "ADDRESS_HOME_CITY";
+    case ADDRESS_HOME_STATE:
+      return "ADDRESS_HOME_STATE";
+    case ADDRESS_HOME_ZIP:
+      return "ADDRESS_HOME_ZIP";
+    case ADDRESS_HOME_COUNTRY:
+      return "ADDRESS_HOME_COUNTRY";
+    case ADDRESS_BILLING_LINE1:
+      return "ADDRESS_BILLING_LINE1";
+    case ADDRESS_BILLING_LINE2:
+      return "ADDRESS_BILLING_LINE2";
+    case ADDRESS_BILLING_APT_NUM:
+      return "ADDRESS_BILLING_APT_NUM";
+    case ADDRESS_BILLING_CITY:
+      return "ADDRESS_BILLING_CITY";
+    case ADDRESS_BILLING_STATE:
+      return "ADDRESS_BILLING_STATE";
+    case ADDRESS_BILLING_ZIP:
+      return "ADDRESS_BILLING_ZIP";
+    case ADDRESS_BILLING_COUNTRY:
+      return "ADDRESS_BILLING_COUNTRY";
+    case CREDIT_CARD_NAME:
+      return "CREDIT_CARD_NAME";
+    case CREDIT_CARD_NUMBER:
+      return "CREDIT_CARD_NUMBER";
+    case CREDIT_CARD_EXP_MONTH:
+      return "CREDIT_CARD_EXP_MONTH";
+    case CREDIT_CARD_EXP_2_DIGIT_YEAR:
+      return "CREDIT_CARD_EXP_2_DIGIT_YEAR";
+    case CREDIT_CARD_EXP_4_DIGIT_YEAR:
+      return "CREDIT_CARD_EXP_4_DIGIT_YEAR";
+    case CREDIT_CARD_EXP_DATE_2_DIGIT_YEAR:
+      return "CREDIT_CARD_EXP_DATE_2_DIGIT_YEAR";
+    case CREDIT_CARD_EXP_DATE_4_DIGIT_YEAR:
+      return "CREDIT_CARD_EXP_DATE_4_DIGIT_YEAR";
+    case CREDIT_CARD_TYPE:
+      return "CREDIT_CARD_TYPE";
+    case CREDIT_CARD_VERIFICATION_CODE:
+      return "CREDIT_CARD_VERIFICATION_CODE";
+    case COMPANY_NAME:
+      return "COMPANY_NAME";
+    default:
+      NOTREACHED() << "Invalid AutoFillFieldType value.";
+  }
+  return std::string();
+}
+
+// static
+AutoFillFieldType AutoFillType::StringToFieldType(const std::string& str) {
+  if (str == "NO_SERVER_DATA")
+    return NO_SERVER_DATA;
+  if (str == "UNKNOWN_TYPE")
+    return UNKNOWN_TYPE;
+  if (str == "EMPTY_TYPE")
+    return EMPTY_TYPE;
+  if (str == "NAME_FIRST")
+    return NAME_FIRST;
+  if (str == "NAME_MIDDLE")
+    return NAME_MIDDLE;
+  if (str == "NAME_LAST")
+    return NAME_LAST;
+  if (str == "NAME_MIDDLE_INITIAL")
+    return NAME_MIDDLE_INITIAL;
+  if (str == "NAME_FULL")
+    return NAME_FULL;
+  if (str == "NAME_SUFFIX")
+    return NAME_SUFFIX;
+  if (str == "EMAIL_ADDRESS")
+    return EMAIL_ADDRESS;
+  if (str == "PHONE_HOME_NUMBER")
+    return PHONE_HOME_NUMBER;
+  if (str == "PHONE_HOME_CITY_CODE")
+    return PHONE_HOME_CITY_CODE;
+  if (str == "PHONE_HOME_COUNTRY_CODE")
+    return PHONE_HOME_COUNTRY_CODE;
+  if (str == "PHONE_HOME_CITY_AND_NUMBER")
+    return PHONE_HOME_CITY_AND_NUMBER;
+  if (str == "PHONE_HOME_WHOLE_NUMBER")
+    return PHONE_HOME_WHOLE_NUMBER;
+  if (str == "PHONE_FAX_NUMBER")
+    return PHONE_FAX_NUMBER;
+  if (str == "PHONE_FAX_CITY_CODE")
+    return PHONE_FAX_CITY_CODE;
+  if (str == "PHONE_FAX_COUNTRY_CODE")
+    return PHONE_FAX_COUNTRY_CODE;
+  if (str == "PHONE_FAX_CITY_AND_NUMBER")
+    return PHONE_FAX_CITY_AND_NUMBER;
+  if (str == "PHONE_FAX_WHOLE_NUMBER")
+    return PHONE_FAX_WHOLE_NUMBER;
+  if (str == "ADDRESS_HOME_LINE1")
+    return ADDRESS_HOME_LINE1;
+  if (str == "ADDRESS_HOME_LINE2")
+    return ADDRESS_HOME_LINE2;
+  if (str == "ADDRESS_HOME_APT_NUM")
+    return ADDRESS_HOME_APT_NUM;
+  if (str == "ADDRESS_HOME_CITY")
+    return ADDRESS_HOME_CITY;
+  if (str == "ADDRESS_HOME_STATE")
+    return ADDRESS_HOME_STATE;
+  if (str == "ADDRESS_HOME_ZIP")
+    return ADDRESS_HOME_ZIP;
+  if (str == "ADDRESS_HOME_COUNTRY")
+    return ADDRESS_HOME_COUNTRY;
+  if (str == "ADDRESS_BILLING_LINE1")
+    return ADDRESS_BILLING_LINE1;
+  if (str == "ADDRESS_BILLING_LINE2")
+    return ADDRESS_BILLING_LINE2;
+  if (str == "ADDRESS_BILLING_APT_NUM")
+    return ADDRESS_BILLING_APT_NUM;
+  if (str == "ADDRESS_BILLING_CITY")
+    return ADDRESS_BILLING_CITY;
+  if (str == "ADDRESS_BILLING_STATE")
+    return ADDRESS_BILLING_STATE;
+  if (str == "ADDRESS_BILLING_ZIP")
+    return ADDRESS_BILLING_ZIP;
+  if (str == "ADDRESS_BILLING_COUNTRY")
+    return ADDRESS_BILLING_COUNTRY;
+  if (str == "CREDIT_CARD_NAME")
+    return CREDIT_CARD_NAME;
+  if (str == "CREDIT_CARD_NUMBER")
+    return CREDIT_CARD_NUMBER;
+  if (str == "CREDIT_CARD_EXP_MONTH")
+    return CREDIT_CARD_EXP_MONTH;
+  if (str == "CREDIT_CARD_EXP_2_DIGIT_YEAR")
+    return CREDIT_CARD_EXP_2_DIGIT_YEAR;
+  if (str == "CREDIT_CARD_EXP_4_DIGIT_YEAR")
+    return CREDIT_CARD_EXP_4_DIGIT_YEAR;
+  if (str == "CREDIT_CARD_EXP_DATE_2_DIGIT_YEAR")
+    return CREDIT_CARD_EXP_DATE_2_DIGIT_YEAR;
+  if (str == "CREDIT_CARD_EXP_DATE_4_DIGIT_YEAR")
+    return CREDIT_CARD_EXP_DATE_4_DIGIT_YEAR;
+  if (str == "CREDIT_CARD_TYPE")
+    return CREDIT_CARD_TYPE;
+  if (str == "CREDIT_CARD_VERIFICATION_CODE")
+    return CREDIT_CARD_VERIFICATION_CODE;
+  if (str == "COMPANY_NAME")
+    return COMPANY_NAME;
+
+  NOTREACHED() << "Unknown AutoFillFieldType " << str;
+  return UNKNOWN_TYPE;
+}