Sync: Generalize entity injection in Android tests

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/basictypes.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
@@ skipping 44 matching lines @@
       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(
-      syncer::AUTOFILL_WALLET_DATA,
       kDefaultCardID,
       specifics));
 }
 
 }  // namespace
 
 class SingleClientWalletSyncTest : public SyncTest {
  public:
   SingleClientWalletSyncTest() : SyncTest(SINGLE_CLIENT) {}
   ~SingleClientWalletSyncTest() override {}
@@ skipping 68 matching lines @@
 // Tests that an experiment received at sync startup time (during sign-in)
 // enables the wallet datatype.
 IN_PROC_BROWSER_TEST_F(SingleClientWalletSyncTest,
                        EnabledViaExperimentStartup) {
   sync_pb::EntitySpecifics experiment_entity;
   sync_pb::ExperimentsSpecifics* experiment_specifics =
       experiment_entity.mutable_experiments();
   experiment_specifics->mutable_wallet_sync()->set_enabled(true);
   GetFakeServer()->InjectEntity(
       fake_server::UniqueClientEntity::CreateForInjection(
-          syncer::EXPERIMENTS,
           kWalletSyncExperimentTag,
           experiment_entity));
 
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed";
   ASSERT_TRUE(GetClient(0)->service()->GetActiveDataTypes().Has(
       syncer::AUTOFILL_WALLET_DATA));
 }
 
 // Tests receiving an enable experiment at runtime, followed by a disabled
 // experiment, and verifies the datatype is enabled/disabled as necessary.
 IN_PROC_BROWSER_TEST_F(SingleClientWalletSyncTest,
                        EnabledDisabledViaExperiment) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed";
   ASSERT_FALSE(GetClient(0)->service()->GetActiveDataTypes().
       Has(syncer::AUTOFILL_WALLET_DATA));
 
   sync_pb::EntitySpecifics experiment_entity;
   sync_pb::ExperimentsSpecifics* experiment_specifics =
       experiment_entity.mutable_experiments();
 
   // First enable the experiment.
   experiment_specifics->mutable_wallet_sync()->set_enabled(true);
   GetFakeServer()->InjectEntity(
       fake_server::UniqueClientEntity::CreateForInjection(
-          syncer::EXPERIMENTS, kWalletSyncExperimentTag, experiment_entity));
+          kWalletSyncExperimentTag, experiment_entity));
   TriggerSyncCycle();
 
   WalletEnabledChecker enabled_checker;
   enabled_checker.Wait();
   ASSERT_FALSE(enabled_checker.TimedOut());
   ASSERT_TRUE(GetClient(0)->service()->GetActiveDataTypes().Has(
       syncer::AUTOFILL_WALLET_DATA));
 
   // Then disable the experiment.
   experiment_specifics->mutable_wallet_sync()->set_enabled(false);
   GetFakeServer()->InjectEntity(
       fake_server::UniqueClientEntity::CreateForInjection(
-          syncer::EXPERIMENTS, kWalletSyncExperimentTag, experiment_entity));
+          kWalletSyncExperimentTag, experiment_entity));
   TriggerSyncCycle();
 
   WalletDisabledChecker disable_checker;
   disable_checker.Wait();
   ASSERT_FALSE(disable_checker.TimedOut());
   ASSERT_FALSE(GetClient(0)->service()->GetActiveDataTypes().
       Has(syncer::AUTOFILL_WALLET_DATA));
 }
 
 IN_PROC_BROWSER_TEST_F(SingleClientWalletSyncTest, Download) {
@@ skipping 68 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());
 }