[Merge-57] Add billing_address_id and has_converted to autofill_table

components/autofill/core/browser/personal_data_manager.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/personal_data_manager.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <list>
@@ skipping 463 matching lines @@
   if (is_off_the_record_ || !database_.get())
     return;
 
   CreditCard* credit_card = GetCreditCardByGUID(data_model.guid());
   if (credit_card) {
     credit_card->RecordAndLogUse();
 
     if (credit_card->record_type() == CreditCard::LOCAL_CARD)
       database_->UpdateCreditCard(*credit_card);
     else
-      database_->UpdateServerCardUsageStats(*credit_card);
+      database_->UpdateServerCardMetadata(*credit_card);
 
     Refresh();
     return;
   }
 
   AutofillProfile* profile = GetProfileByGUID(data_model.guid());
   if (profile) {
     profile->RecordAndLogUse();
 
     if (profile->record_type() == AutofillProfile::LOCAL_PROFILE)
       database_->UpdateAutofillProfile(*profile);
     else if (profile->record_type() == AutofillProfile::SERVER_PROFILE)
-      database_->UpdateServerAddressUsageStats(*profile);
+      database_->UpdateServerAddressMetadata(*profile);
 
     Refresh();
   }
 }
 
 void PersonalDataManager::AddProfile(const AutofillProfile& profile) {
   if (is_off_the_record_)
     return;
 
   if (profile.IsEmpty(app_locale_))
@@ skipping 134 matching lines @@
     database_->MaskServerCreditCard(credit_card.server_id());
   }
 
   Refresh();
 }
 
 void PersonalDataManager::UpdateServerCardMetadata(
     const CreditCard& credit_card) {
   DCHECK_NE(CreditCard::LOCAL_CARD, credit_card.record_type());
 
-  if (!database_.get())
+  if (is_off_the_record_ || !database_.get())
     return;
 
-  CreditCard* existing_credit_card = nullptr;
-  for (auto& server_card : server_credit_cards_) {
-    if (credit_card.server_id() == server_card->server_id()) {
-      existing_credit_card = server_card.get();
-      break;
-    }
-  }
-  if (!existing_credit_card
-      || existing_credit_card->billing_address_id() ==
-          credit_card.billing_address_id()) {
-    return;
-  }
-
-  existing_credit_card->set_billing_address_id(
-      credit_card.billing_address_id());
-  database_->UpdateServerCardBillingAddress(*existing_credit_card);
+  database_->UpdateServerCardMetadata(credit_card);
 
   Refresh();
 }
 
 void PersonalDataManager::ResetFullServerCard(const std::string& guid) {
   for (const auto& card : server_credit_cards_) {
     if (card->guid() == guid) {
       DCHECK_EQ(card->record_type(), CreditCard::FULL_SERVER_CARD);
       CreditCard card_copy = *card;
       card_copy.set_record_type(CreditCard::MASKED_SERVER_CARD);
@@ skipping 1180 matching lines @@
     }
 
     // If the card was modified, apply the changes to the database.
     if (was_modified) {
       database_->UpdateCreditCard(*credit_card);
     }
   }
 }
 
 }  // namespace autofill