[Merge-57] Add billing_address_id and has_converted to autofill_table

components/autofill/core/browser/webdata/autofill_webdata_service.cc

 // 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.
 
 #include "components/autofill/core/browser/webdata/autofill_webdata_service.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/single_thread_task_runner.h"
@@ skipping 194 matching lines @@
            autofill_backend_, id));
 }
 
 void AutofillWebDataService::ClearAllServerData() {
   wdbs_->ScheduleDBTask(
       FROM_HERE,
       Bind(&AutofillWebDataBackendImpl::ClearAllServerData,
            autofill_backend_));
 }
 
-void AutofillWebDataService::UpdateServerCardUsageStats(
+void AutofillWebDataService::UpdateServerCardMetadata(
     const CreditCard& credit_card) {
   wdbs_->ScheduleDBTask(
-      FROM_HERE,
-      Bind(&AutofillWebDataBackendImpl::UpdateServerCardUsageStats,
-           autofill_backend_, credit_card));
+      FROM_HERE, Bind(&AutofillWebDataBackendImpl::UpdateServerCardMetadata,
+                      autofill_backend_, credit_card));
 }
 
-void AutofillWebDataService::UpdateServerAddressUsageStats(
+void AutofillWebDataService::UpdateServerAddressMetadata(
     const AutofillProfile& profile) {
   wdbs_->ScheduleDBTask(
-      FROM_HERE,
-      Bind(&AutofillWebDataBackendImpl::UpdateServerAddressUsageStats,
-           autofill_backend_, profile));
-}
-
-void AutofillWebDataService::UpdateServerCardBillingAddress(
-    const CreditCard& credit_card) {
-  wdbs_->ScheduleDBTask(
-      FROM_HERE,
-      Bind(&AutofillWebDataBackendImpl::UpdateServerCardBillingAddress,
-           autofill_backend_, credit_card));
+      FROM_HERE, Bind(&AutofillWebDataBackendImpl::UpdateServerAddressMetadata,
+                      autofill_backend_, profile));
 }
 
 void AutofillWebDataService::RemoveAutofillDataModifiedBetween(
     const Time& delete_begin,
     const Time& delete_end) {
   wdbs_->ScheduleDBTask(
       FROM_HERE,
       Bind(&AutofillWebDataBackendImpl::RemoveAutofillDataModifiedBetween,
            autofill_backend_, delete_begin, delete_end));
 }
@@ skipping 53 matching lines @@
 }
 
 void AutofillWebDataService::NotifySyncStartedOnUIThread(
     syncer::ModelType model_type) {
   DCHECK(ui_thread_->BelongsToCurrentThread());
   for (auto& ui_observer : ui_observer_list_)
     ui_observer.SyncStarted(model_type);
 }
 
 }  // namespace autofill