[Autofill] Autofill fails to fill credit card number when split across fields.

components/autofill/core/browser/autofill_type.cc

Index: components/autofill/core/browser/autofill_type.cc
diff --git a/components/autofill/core/browser/autofill_type.cc b/components/autofill/core/browser/autofill_type.cc
index 824aac1b8709ffa5af5a0db4cdd2b77158b8c953..07308045ca1327bc568c24a7e60b3814e7799309 100644
--- a/components/autofill/core/browser/autofill_type.cc
+++ b/components/autofill/core/browser/autofill_type.cc
@@ -104,6 +104,10 @@ FieldTypeGroup AutofillType::group() const {
 
     case CREDIT_CARD_NAME:
     case CREDIT_CARD_NUMBER:
+    case CREDIT_CARD_NUMBER_PART1:
+    case CREDIT_CARD_NUMBER_PART2:
+    case CREDIT_CARD_NUMBER_PART3:
+    case CREDIT_CARD_NUMBER_PART4:
     case CREDIT_CARD_EXP_MONTH:
     case CREDIT_CARD_EXP_2_DIGIT_YEAR:
     case CREDIT_CARD_EXP_4_DIGIT_YEAR:
@@ -166,6 +170,10 @@ FieldTypeGroup AutofillType::group() const {
 
     case HTML_TYPE_CREDIT_CARD_NAME:
     case HTML_TYPE_CREDIT_CARD_NUMBER:
+    case HTML_TYPE_CREDIT_CARD_NUMBER_PART1:
+    case HTML_TYPE_CREDIT_CARD_NUMBER_PART2:
+    case HTML_TYPE_CREDIT_CARD_NUMBER_PART3:
+    case HTML_TYPE_CREDIT_CARD_NUMBER_PART4:
     case HTML_TYPE_CREDIT_CARD_EXP:
     case HTML_TYPE_CREDIT_CARD_EXP_DATE_2_DIGIT_YEAR:
     case HTML_TYPE_CREDIT_CARD_EXP_DATE_4_DIGIT_YEAR:
@@ -337,6 +345,18 @@ ServerFieldType AutofillType::GetStorableType() const {
     case HTML_TYPE_CREDIT_CARD_NUMBER:
       return CREDIT_CARD_NUMBER;
 
+    case HTML_TYPE_CREDIT_CARD_NUMBER_PART1:
+      return CREDIT_CARD_NUMBER_PART1;
+
+    case HTML_TYPE_CREDIT_CARD_NUMBER_PART2:
+      return CREDIT_CARD_NUMBER_PART2;
+
+    case HTML_TYPE_CREDIT_CARD_NUMBER_PART3:
+      return CREDIT_CARD_NUMBER_PART3;
+
+    case HTML_TYPE_CREDIT_CARD_NUMBER_PART4:
+      return CREDIT_CARD_NUMBER_PART4;
+
     case HTML_TYPE_CREDIT_CARD_EXP:
       return CREDIT_CARD_EXP_DATE_4_DIGIT_YEAR;
 
@@ -562,6 +582,14 @@ std::string AutofillType::ToString() const {
       return "CREDIT_CARD_NAME";
     case CREDIT_CARD_NUMBER:
       return "CREDIT_CARD_NUMBER";
+    case CREDIT_CARD_NUMBER_PART1:
+      return "CREDIT_CARD_NUMBER_PART1";
+    case CREDIT_CARD_NUMBER_PART2:
+      return "CREDIT_CARD_NUMBER_PART2";
+    case CREDIT_CARD_NUMBER_PART3:
+      return "CREDIT_CARD_NUMBER_PART3";
+    case CREDIT_CARD_NUMBER_PART4:
+      return "CREDIT_CARD_NUMBER_PART4";
     case CREDIT_CARD_EXP_MONTH:
       return "CREDIT_CARD_EXP_MONTH";
     case CREDIT_CARD_EXP_2_DIGIT_YEAR:
@@ -655,6 +683,14 @@ std::string AutofillType::ToString() const {
       return "HTML_TYPE_CREDIT_CARD_NAME";
     case HTML_TYPE_CREDIT_CARD_NUMBER:
       return "HTML_TYPE_CREDIT_CARD_NUMBER";
+    case HTML_TYPE_CREDIT_CARD_NUMBER_PART1:
+      return "HTML_TYPE_CREDIT_CARD_NUMBER_PART1";
+    case HTML_TYPE_CREDIT_CARD_NUMBER_PART2:
+      return "HTML_TYPE_CREDIT_CARD_NUMBER_PART2";
+    case HTML_TYPE_CREDIT_CARD_NUMBER_PART3:
+      return "HTML_TYPE_CREDIT_CARD_NUMBER_PART3";
+    case HTML_TYPE_CREDIT_CARD_NUMBER_PART4:
+      return "HTML_TYPE_CREDIT_CARD_NUMBER_PART4";
     case HTML_TYPE_CREDIT_CARD_EXP:
       return "HTML_TYPE_CREDIT_CARD_EXP";
     case HTML_TYPE_CREDIT_CARD_EXP_MONTH: