[AF Wallet] Use different specifics ids in integration tests

This CL fixes an omission in integration tests for autofill wallet that
different credit cards / addresses served by the server still had same
ids in the specifics.

This in particular fixes a test failure for CL 1236693.

Bug: 853688
Change-Id: Iecb050ceb56f709004b16f6712196b71d0be56b0
Reviewed-on: https://chromium-review.googlesource.com/1238536
Commit-Queue: Sebastien Seguin-Gagnon <sebsg@chromium.org>
Reviewed-by: Sebastien Seguin-Gagnon <sebsg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#593161}

chrome/browser/sync/test/integration/single_client_wallet_sync_test.cc

@@ -206,10 +206,11 @@ sync_pb::SyncEntity CreateSyncWalletCard(const std::string& name,
   sync_pb::SyncEntity result = CreateDefaultSyncWalletCard();
   result.set_name(name);
   result.set_id_string(name);
-  result.mutable_specifics()
-      ->mutable_autofill_wallet()
-      ->mutable_masked_card()
-      ->set_last_four(last_four);
+  sync_pb::WalletMaskedCreditCard* credit_card = result.mutable_specifics()
+                                                     ->mutable_autofill_wallet()
+                                                     ->mutable_masked_card();
+  credit_card->set_last_four(last_four);
+  credit_card->set_id(name);
   return result;
 }
 
@@ -262,10 +263,10 @@ sync_pb::SyncEntity CreateSyncWalletAddress(const std::string& name,
   sync_pb::SyncEntity result = CreateDefaultSyncWalletAddress();
   result.set_name(name);
   result.set_id_string(name);
-  result.mutable_specifics()
-      ->mutable_autofill_wallet()
-      ->mutable_address()
-      ->set_company_name(company);
+  sync_pb::WalletPostalAddress* wallet_address =
+      result.mutable_specifics()->mutable_autofill_wallet()->mutable_address();
+  wallet_address->set_id(name);
+  wallet_address->set_company_name(company);
   return result;
 }