Refactors cvc and expiration date validation in CC upload logic as well as unmask prompt.

components/autofill/core/browser/autofill_manager.cc

Index: components/autofill/core/browser/autofill_manager.cc
diff --git a/components/autofill/core/browser/autofill_manager.cc b/components/autofill/core/browser/autofill_manager.cc
index 7cda51daaf99ff7885d5cd08847223df93587550..1d6224933da0ca33b1b3ada5d68866b8f4868326 100644
--- a/components/autofill/core/browser/autofill_manager.cc
+++ b/components/autofill/core/browser/autofill_manager.cc
@@ -1164,9 +1164,12 @@ void AutofillManager::ImportFormData(const FormStructure& submitted_form) {
     // local save but we believe that sometimes offering upload and sometimes
     // offering local save is a confusing user experience.
     int cvc;
+    size_t cvc_size =
+        upload_request_.card.type() == kAmericanExpressCard ? 4 : 3;

[Mathieu, 2017/01/04 16:37:22]

Could you use (or extend) this code?

https://cs.chromium.org/chromium/src/components/autofill/core/browser/validat...

[Moe, 2017/01/04 18:07:31]

Done.

     for (const auto& field : submitted_form) {
       if (field->Type().GetStorableType() == CREDIT_CARD_VERIFICATION_CODE &&
-          base::StringToInt(field->value, &cvc)) {
+          base::StringToInt(field->value, &cvc) &&
+          field->value.size() == cvc_size) {
         upload_request_.cvc = field->value;
         break;
       }