Look in all available CVC fields for a value for credit card upload.

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 ea4c155b95a449c7ed10a19e9755d9580b4c07d5..e9a470cba8d634a2aa3317863591c8fc77bb5d3a 100644
--- a/components/autofill/core/browser/autofill_manager.cc
+++ b/components/autofill/core/browser/autofill_manager.cc
@@ -1075,7 +1075,8 @@ 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.
     for (const AutofillField* field : submitted_form) {
-      if (field->Type().GetStorableType() == CREDIT_CARD_VERIFICATION_CODE) {
+      if (field->Type().GetStorableType() == CREDIT_CARD_VERIFICATION_CODE &&
+          !field->value.empty()) {

[Mathieu, 2016/04/20 20:00:41]

note that this is still not fully robust (some fields will have "___" or some
stuff) but it's probably good. You could also try to StringToInt it. Up to you.

[Justin Donnelly, 2016/04/20 20:58:01]

Good idea. Done.

         upload_request_.cvc = field->value;
         break;
       }