Sync: Generalize entity injection in Android tests

sync/test/fake_server/unique_client_entity.h

 // Copyright 2014 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.
 
 #ifndef SYNC_TEST_FAKE_SERVER_UNIQUE_CLIENT_ENTITY_H_
 #define SYNC_TEST_FAKE_SERVER_UNIQUE_CLIENT_ENTITY_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 25 matching lines @@
                      int64 last_modified_time);
 
   ~UniqueClientEntity() override;
 
   // Factory function for creating a UniqueClientEntity.
   static FakeServerEntity* Create(const sync_pb::SyncEntity& client_entity);
 
   // Factory function for creating a UniqueClientEntity for use in the
   // FakeServer injection API.
   static scoped_ptr<FakeServerEntity> CreateForInjection(
-      syncer::ModelType model_type,
       const std::string& name,
       const sync_pb::EntitySpecifics& entity_specifics);
 
   // Derives an ID from a unique client tagged entity.
   static std::string EffectiveIdForClientTaggedEntity(
       const sync_pb::SyncEntity& entity);
 
   // FakeServerEntity implementation.
   std::string GetParentId() const override;
   void SerializeAsProto(sync_pb::SyncEntity* proto) override;
   bool IsDeleted() const override;
   bool IsFolder() const override;
 
  private:
   // These member values have equivalent fields in SyncEntity.
   std::string client_defined_unique_tag_;
   sync_pb::EntitySpecifics specifics_;
   int64 creation_time_;
   int64 last_modified_time_;
 };
 
 }  // namespace fake_server
 
 #endif  // SYNC_TEST_FAKE_SERVER_UNIQUE_CLIENT_ENTITY_H_