Revert "[Payments] Add billing_address_id and has_converted to autofill_table"

components/autofill/core/browser/webdata/autofill_webdata_backend_impl.h

Index: components/autofill/core/browser/webdata/autofill_webdata_backend_impl.h
diff --git a/components/autofill/core/browser/webdata/autofill_webdata_backend_impl.h b/components/autofill/core/browser/webdata/autofill_webdata_backend_impl.h
index 9badefeb70ce60e0cb741316f8f41f94f2df5abd..a9e2d78e81df048b237303cb38bf45b4bedd6a1a 100644
--- a/components/autofill/core/browser/webdata/autofill_webdata_backend_impl.h
+++ b/components/autofill/core/browser/webdata/autofill_webdata_backend_impl.h
@@ -152,11 +152,17 @@ class AutofillWebDataBackendImpl
   WebDatabase::State MaskServerCreditCard(const std::string& id,
                                           WebDatabase* db);
 
-  WebDatabase::State UpdateServerCardMetadata(const CreditCard& credit_card,
-                                              WebDatabase* db);
+  WebDatabase::State UpdateServerCardUsageStats(
+      const CreditCard& credit_card,
+      WebDatabase* db);
+
+  WebDatabase::State UpdateServerAddressUsageStats(
+      const AutofillProfile& profile,
+      WebDatabase* db);
 
-  WebDatabase::State UpdateServerAddressMetadata(const AutofillProfile& profile,
-                                                 WebDatabase* db);
+  WebDatabase::State UpdateServerCardBillingAddress(
+      const CreditCard& card,
+      WebDatabase* db);
 
   WebDatabase::State ClearAllServerData(WebDatabase* db);