[Merge M53] [Autofill] Improve support for various credit card expiration dates.

components/autofill/core/browser/credit_card.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_CREDIT_CARD_H_
 #define COMPONENTS_AUTOFILL_CORE_BROWSER_CREDIT_CARD_H_
 
 #include <iosfwd>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/compiler_specific.h"
+#include "base/gtest_prod_util.h"
 #include "base/strings/string16.h"
 #include "build/build_config.h"
 #include "components/autofill/core/browser/autofill_data_model.h"
 
 namespace autofill {
 
 // A midline horizontal ellipsis (U+22EF).
 extern const base::char16 kMidlineEllipsis[];
 
 // A form group that stores credit card information.
@@ skipping 173 matching lines @@
 
   // Whether the card expiration date should be updated.
   bool ShouldUpdateExpiration(const base::Time& current_time) const;
 
   const std::string& billing_address_id() const { return billing_address_id_; }
   void set_billing_address_id(const std::string& id) {
     billing_address_id_ = id;
   }
 
  private:
+  FRIEND_TEST_ALL_PREFIXES(CreditCardTest, SetExpirationDateFromString);
+  FRIEND_TEST_ALL_PREFIXES(CreditCardTest, SetExpirationYearFromString);
+
   // FormGroup:
   void GetSupportedTypes(ServerFieldTypeSet* supported_types) const override;
 
   // The type of the card to fill in to the page, e.g. 'Mastercard'.
   base::string16 TypeForFill() const;
 
   // The month and year are zero if not present.
   int Expiration4DigitYear() const { return expiration_year_; }
   int Expiration2DigitYear() const { return expiration_year_ % 100; }
   base::string16 ExpirationMonthAsString() const;
   base::string16 Expiration4DigitYearAsString() const;
   base::string16 Expiration2DigitYearAsString() const;
 
   // Sets |expiration_month_| to the integer conversion of |text| and returns
   // whether the operation was successful.
   bool SetExpirationMonthFromString(const base::string16& text,
                                     const std::string& app_locale);
 
-  // Sets |expiration_year_| to the integer conversion of |text|.
+  // Sets |expiration_year_| to the integer conversion of |text|. Will handle
+  // 4-digit year or 2-digit year (eventually converted to 4-digit year).
   void SetExpirationYearFromString(const base::string16& text);
 
+  // Sets |expiration_year_| and |expiration_month_| to the integer conversion
+  // of |text|. Will handle mmyy, mmyyyy, mm-yyyy and mm-yy as well as single
+  // digit months, with various separators.
+  void SetExpirationDateFromString(const base::string16& text);
+
   // See enum definition above.
   RecordType record_type_;
 
   // The credit card number. For MASKED_SERVER_CARDs, this number will
   // just contain the last four digits of the card number.
   base::string16 number_;
 
   // The cardholder's name. May be empty.
   base::string16 name_on_card_;
 
@@ skipping 25 matching lines @@
 extern const char kDiscoverCard[];
 extern const char kGenericCard[];
 extern const char kJCBCard[];
 extern const char kMasterCard[];
 extern const char kUnionPay[];
 extern const char kVisaCard[];
 
 }  // namespace autofill
 
 #endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_CREDIT_CARD_H_