[Merge-57] Add billing_address_id and has_converted to autofill_table

components/autofill/core/browser/webdata/autofill_webdata.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_WEBDATA_AUTOFILL_WEBDATA_H_
 #define COMPONENTS_AUTOFILL_CORE_BROWSER_WEBDATA_AUTOFILL_WEBDATA_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 91 matching lines @@
       WebDataServiceConsumer* consumer) = 0;
   virtual WebDataServiceBase::Handle GetServerCreditCards(
       WebDataServiceConsumer* consumer) = 0;
 
   // Toggles the record for a server credit card between masked (only last 4
   // digits) and full (all digits).
   virtual void UnmaskServerCreditCard(const CreditCard& credit_card,
                                       const base::string16& full_number) = 0;
   virtual void MaskServerCreditCard(const std::string& id) = 0;
 
-  // Updates the use count and last use date for a server card (masked or not).
-  virtual void UpdateServerCardUsageStats(const CreditCard& credit_card) = 0;
+  // Updates the metadata for a server card (masked or not).
+  virtual void UpdateServerCardMetadata(const CreditCard& credit_card) = 0;
 
-  // Updates the use count and last use date for a server address.
-  virtual void UpdateServerAddressUsageStats(const AutofillProfile& profile)
-      = 0;
-
-  // Updates the billing address for a server card (masked or not).
-  virtual void UpdateServerCardBillingAddress(const CreditCard& credit_card)
-      = 0;
+  // Updates the metadata for a server address.
+  virtual void UpdateServerAddressMetadata(const AutofillProfile& profile) = 0;
 
   // Removes Autofill records from the database.
   virtual void RemoveAutofillDataModifiedBetween(
       const base::Time& delete_begin, const base::Time& delete_end) = 0;
 
   // Removes origin URLs associated with Autofill profiles and credit cards from
   // the database.
   virtual void RemoveOriginURLsModifiedBetween(
       const base::Time& delete_begin, const base::Time& delete_end) = 0;
 };
 
 }  // namespace autofill
 
 #endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_WEBDATA_AUTOFILL_WEBDATA_H_