Reland - Replace FakeServer's implementation with LoopbackServer invocations.

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

 // Copyright (c) 2015 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 "base/command_line.h"
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/sync/test/integration/autofill_helper.h"
 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h"
 #include "chrome/browser/sync/test/integration/single_client_status_change_checker.h"
 #include "chrome/browser/sync/test/integration/sync_datatype_helper.h"
 #include "chrome/browser/sync/test/integration/sync_test.h"
 #include "chrome/browser/web_data_service_factory.h"
 #include "components/autofill/core/browser/credit_card.h"
 #include "components/autofill/core/browser/field_types.h"
 #include "components/autofill/core/browser/personal_data_manager.h"
 #include "components/autofill/core/common/autofill_pref_names.h"
 #include "components/browser_sync/profile_sync_service.h"
 #include "components/prefs/pref_service.h"
 #include "components/sync/base/model_type.h"
-#include "components/sync/test/fake_server/fake_server_entity.h"
-#include "components/sync/test/fake_server/unique_client_entity.h"
+#include "components/sync/test/fake_server/fake_server.h"
 #include "content/public/browser/notification_service.h"
 
 using autofill_helper::GetPersonalDataManager;
 
 namespace {
 
 const char kDefaultCardID[] = "wallet entity ID";
 const int kDefaultCardExpMonth = 8;
 const int kDefaultCardExpYear = 2087;
 const char kDefaultCardLastFour[] = "1234";
@@ skipping 11 matching lines @@
   sync_pb::WalletMaskedCreditCard* credit_card =
       wallet_specifics->mutable_masked_card();
   credit_card->set_id(kDefaultCardID);
   credit_card->set_exp_month(kDefaultCardExpMonth);
   credit_card->set_exp_year(kDefaultCardExpYear);
   credit_card->set_last_four(kDefaultCardLastFour);
   credit_card->set_name_on_card(kDefaultCardName);
   credit_card->set_status(sync_pb::WalletMaskedCreditCard::VALID);
   credit_card->set_type(kDefaultCardType);
 
-  server->InjectEntity(fake_server::UniqueClientEntity::CreateForInjection(
-      kDefaultCardID,
-      specifics));
+  server->InjectEntity(
+      syncer::PersistentUniqueClientEntity::CreateFromEntitySpecifics(
+          kDefaultCardID, specifics));
 }
 
 }  // namespace
 
 class SingleClientWalletSyncTest : public SyncTest {
  public:
   SingleClientWalletSyncTest() : SyncTest(SINGLE_CLIENT) {}
   ~SingleClientWalletSyncTest() override {}
 
  private:
@@ skipping 114 matching lines @@
   std::vector<autofill::CreditCard*> cards = pdm->GetCreditCards();
   ASSERT_EQ(1uL, cards.size());
 
   // Turn off the wallet autofill pref, the card should be gone as a side
   // effect of the wallet data type controller noticing.
   GetProfile(0)->GetPrefs()->SetBoolean(
       autofill::prefs::kAutofillWalletImportEnabled, false);
   cards = pdm->GetCreditCards();
   ASSERT_EQ(0uL, cards.size());
 }