[Autofill] Transfer billing address of server cards when deduping.

components/autofill/core/browser/personal_data_manager_unittest.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 4785 matching lines @@
   credit_card2->set_billing_address_id("D");
   CreditCard* credit_card3 =
       new CreditCard(base::GenerateGUID(), "https://www.example.com");
   credit_card3->set_billing_address_id("E");
   CreditCard* credit_card4 =
       new CreditCard(base::GenerateGUID(), "https://www.example.com");
   credit_card4->set_billing_address_id("F");
 
   // Add the credit cards to the database.
   personal_data_->local_credit_cards_.push_back(base::WrapUnique(credit_card1));
-  personal_data_->local_credit_cards_.push_back(base::WrapUnique(credit_card2));
+  personal_data_->server_credit_cards_.push_back(
+      base::WrapUnique(credit_card2));
   personal_data_->local_credit_cards_.push_back(base::WrapUnique(credit_card3));
-  personal_data_->local_credit_cards_.push_back(base::WrapUnique(credit_card4));
+  personal_data_->server_credit_cards_.push_back(
+      base::WrapUnique(credit_card4));
 
   personal_data_->UpdateCardsBillingAddressReference(guids_merge_map);
 
   // The first card's billing address should now be E.
   EXPECT_EQ("E", credit_card1->billing_address_id());
   // The second card's billing address should now be E.
   EXPECT_EQ("E", credit_card2->billing_address_id());
   // The third card's billing address should still be E.
   EXPECT_EQ("E", credit_card3->billing_address_id());
   // The fourth card's billing address should still be F.
@@ skipping 820 matching lines @@
   EnableAutofillProfileCleanup();
 
   // The deduping routine should not be run.
   EXPECT_FALSE(personal_data_->ApplyDedupingRoutine());
 
   // The two duplicate profiles should still be present.
   EXPECT_EQ(2U, personal_data_->GetProfiles().size());
 }
 
 }  // namespace autofill