[Merge-57] Add billing_address_id and has_converted to autofill_table

components/autofill/core/browser/webdata/autofill_webdata_service.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_SERVICE_H_
 #define COMPONENTS_AUTOFILL_CORE_BROWSER_WEBDATA_AUTOFILL_WEBDATA_SERVICE_H_
 
 #include <vector>
 
 #include "base/macros.h"
@@ skipping 79 matching lines @@
 
   // Server cards.
   WebDataServiceBase::Handle GetServerCreditCards(
       WebDataServiceConsumer* consumer) override;
   void UnmaskServerCreditCard(const CreditCard& card,
                               const base::string16& full_number) override;
   void MaskServerCreditCard(const std::string& id) override;
 
   void ClearAllServerData();
 
-  void UpdateServerCardUsageStats(const CreditCard& credit_card) override;
-  void UpdateServerAddressUsageStats(const AutofillProfile& profile) override;
-  void UpdateServerCardBillingAddress(const CreditCard& credit_card) override;
+  void UpdateServerCardMetadata(const CreditCard& credit_card) override;
+  void UpdateServerAddressMetadata(const AutofillProfile& profile) override;
 
   void RemoveAutofillDataModifiedBetween(const base::Time& delete_begin,
                                          const base::Time& delete_end) override;
   void RemoveOriginURLsModifiedBetween(const base::Time& delete_begin,
                                        const base::Time& delete_end) override;
 
   void AddObserver(AutofillWebDataServiceObserverOnDBThread* observer);
   void RemoveObserver(AutofillWebDataServiceObserverOnDBThread* observer);
 
   void AddObserver(AutofillWebDataServiceObserverOnUIThread* observer);
@@ skipping 37 matching lines @@
   // This factory is used on the UI thread. All vended weak pointers are
   // invalidated in ShutdownOnUIThread().
   base::WeakPtrFactory<AutofillWebDataService> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(AutofillWebDataService);
 };
 
 }  // namespace autofill
 
 #endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_WEBDATA_AUTOFILL_WEBDATA_SERVICE_H_