AutoFill: Aggregate profile data. Remove the AutoFill InfoBar.

chrome/browser/autofill/credit_card.h

 // Copyright (c) 2010 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 CHROME_BROWSER_AUTOFILL_CREDIT_CARD_H_
 #define CHROME_BROWSER_AUTOFILL_CREDIT_CARD_H_
 
 #include <vector>
 
 #include "base/string16.h"
 #include "chrome/browser/autofill/form_group.h"
 
 // A form group that stores credit card information.
 class CreditCard : public FormGroup {
  public:
   CreditCard(const string16& label, int unique_id);
   // For use in STL containers.
   CreditCard(const CreditCard& card);
   CreditCard();
 
   // FormGroup implementation:
   FormGroup* Clone() const;
   virtual void GetPossibleFieldTypes(const string16& text,
                                      FieldTypeSet* possible_types) const;
+  virtual void GetAvailableFieldTypes(FieldTypeSet* available_types) const;
   virtual void FindInfoMatches(const AutoFillType& type,
                                const string16& info,
                                std::vector<string16>* matched_text) const;
   virtual string16 GetFieldText(const AutoFillType& type) const;
   virtual string16 GetPreviewText(const AutoFillType& type) const;
   virtual void SetInfo(const AutoFillType& type, const string16& value);
   const string16& Label() const { return label_; }
 
   // The number altered for display, for example: ******1234
   string16 ObfuscatedNumber() const;
   // Credit card preview summary, for example: ******1234, Exp: 01/2020
   string16 PreviewSummary() const;
   // The last four digits of the credit card number.
   string16 LastFourDigits() const;
 
   const string16& billing_address() const { return billing_address_; }
-  const string16& shipping_address() const { return shipping_address_; }
   int unique_id() const { return unique_id_; }
 
-  // The caller should verify that the corresponding AutoFillProfile exists.  If
-  // the shipping address should be the same as the billing address, send in an
-  // empty string to set_shipping_address.
+  // The caller should verify that the corresponding AutoFillProfile exists.
   void set_billing_address(const string16& address) {
     billing_address_ = address;
   }
-  void set_shipping_address(const string16& address) {
-    shipping_address_ = address;
-  }
   void set_unique_id(int id) { unique_id_ = id; }
 
   // For use in STL containers.
   void operator=(const CreditCard&);
 
   // Used by tests.
   bool operator==(const CreditCard& creditcard) const;
   bool operator!=(const CreditCard& creditcard) const;
   void set_label(const string16& label) { label_ = label; }
 
@@ skipping 11 matching lines @@
 
   // Sets |expiration_month_| to the integer conversion of |text|.
   void SetExpirationMonthFromString(const string16& text);
 
   // Sets |expiration_year_| to the integer conversion of |text|.
   void SetExpirationYearFromString(const string16& text);
 
   const string16& number() const { return number_; }
   const string16& name_on_card() const { return name_on_card_; }
   const string16& type() const { return type_; }
-  const string16& verification_code() const { return verification_code_; }
   const string16& last_four_digits() const { return last_four_digits_; }
   int expiration_month() const { return expiration_month_; }
   int expiration_year() const { return expiration_year_; }
 
   void set_number(const string16& number) { number_ = number; }
   void set_name_on_card(const string16& name_on_card) {
     name_on_card_ = name_on_card;
   }
   void set_type(const string16& type) { type_ = type; }
-  void set_verification_code(const string16& verification_code) {
-    verification_code_ = verification_code;
-  }
   void set_last_four_digits(const string16& last_four_digits) {
     last_four_digits_ = last_four_digits;
   }
 
   // These setters verify that the month and year are within appropriate
   // ranges.
   void set_expiration_month(int expiration_month);
   void set_expiration_year(int expiration_year);
 
   // A helper function for FindInfoMatches that only handles matching the info
   // with the requested field type.
   bool FindInfoMatchesHelper(const AutoFillFieldType& field_type,
                              const string16& info,
                              string16* match) const;
 
   // Returns true if |text| matches the name on the card.  The comparison is
   // case-insensitive.
   bool IsNameOnCard(const string16& text) const;
 
   // Returns true if |text| matches the expiration month of the card.
   bool IsExpirationMonth(const string16& text) const;
 
-  // Returns true if |text| matches the CVV of the card.  The comparison is
-  // case-insensitive.
-  bool IsVerificationCode(const string16& text) const;
-
   // Returns true if the integer value of |text| matches the 2-digit expiration
   // year.
   bool Is2DigitExpirationYear(const string16& text) const;
 
   // Returns true if the integer value of |text| matches the 4-digit expiration
   // year.
   bool Is4DigitExpirationYear(const string16& text) const;
 
   // Returns true if |text| matches the type of the card.  The comparison is
   // case-insensitive.
   bool IsCardType(const string16& text) const;
 
   // Converts |date| to an integer form.  Returns true if the conversion
   // succeeded.
   bool ConvertDate(const string16& date, int* num) const;
 
   string16 number_;  // The credit card number.
   string16 name_on_card_;  // The cardholder's name.
   string16 type_;  // The type of the card.
-  string16 verification_code_;  // The CVV.
 
   // Stores the last four digits of the credit card number.
   string16 last_four_digits_;
 
   // These members are zero if not present.
   int expiration_month_;
   int expiration_year_;
 
   // This is the display name of the card set by the user, e.g., Amazon Visa.
   string16 label_;
 
-  // The billing and shipping addresses.  The are the labels of
-  // AutoFillProfiles that contain the corresponding address.  If
-  // |shipping_address_| is empty, the billing address is used for the shipping
-  // address.
+  // The billing address. This is the label of the AutoFillProfile that contains
+  // the corresponding billing address.
   string16 billing_address_;
-  string16 shipping_address_;
 
   // The unique ID of this credit card.
   int unique_id_;
 };
 
 // So we can compare CreditCards with EXPECT_EQ().
 std::ostream& operator<<(std::ostream& os, const CreditCard& creditcard);
 
 #endif  // CHROME_BROWSER_AUTOFILL_CREDIT_CARD_H_