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

components/autofill/core/browser/validation.h

Index: components/autofill/core/browser/validation.h
diff --git a/components/autofill/core/browser/validation.h b/components/autofill/core/browser/validation.h
index aaaedcd23b82c8442bec515954d3cf06b43f6797..a09ae75cbb3af7470832ce8306dcfdf34f1d8639 100644
--- a/components/autofill/core/browser/validation.h
+++ b/components/autofill/core/browser/validation.h
@@ -6,6 +6,7 @@
 #define COMPONENTS_AUTOFILL_CORE_BROWSER_VALIDATION_H_
 
 #include "base/strings/string16.h"
+#include "base/strings/string_piece.h"
 
 namespace base {
 class Time;
@@ -23,13 +24,10 @@ bool IsValidCreditCardExpirationDate(int year,
 // Uses the Luhn formula to validate the number.
 bool IsValidCreditCardNumber(const base::string16& text);
 
-// Returns true if |text| looks like a valid credit card security code.
-bool IsValidCreditCardSecurityCode(const base::string16& text);
-
 // Returns true if |code| looks like a valid credit card security code
-// for the type of credit card designated by |number|.
+// for the given credit card type.
 bool IsValidCreditCardSecurityCode(const base::string16& code,
-                                   const base::string16& number);
+                                   const base::StringPiece card_type);
 
 // Returns true if |text| looks like a valid e-mail address.
 bool IsValidEmailAddress(const base::string16& text);