Sync: Generalize entity injection in Android tests

sync/test/fake_server/unique_client_entity.cc

Index: sync/test/fake_server/unique_client_entity.cc
diff --git a/sync/test/fake_server/unique_client_entity.cc b/sync/test/fake_server/unique_client_entity.cc
index 994c9d0e4e5ccbcbdd16e1d8a1472da1a0a8ebf4..5b80370d2ea008168a51de19bda983cb1a350f7f 100644
--- a/sync/test/fake_server/unique_client_entity.cc
+++ b/sync/test/fake_server/unique_client_entity.cc
@@ -17,6 +17,7 @@
 
 using std::string;
 
+using syncer::GetModelTypeFromSpecifics;
 using syncer::ModelType;
 using syncer::syncable::GenerateSyncableHash;
 
@@ -70,9 +71,9 @@ FakeServerEntity* UniqueClientEntity::Create(
 
 // static
 scoped_ptr<FakeServerEntity> UniqueClientEntity::CreateForInjection(
-    ModelType model_type,
     const string& name,
     const sync_pb::EntitySpecifics& entity_specifics) {
+  ModelType model_type = GetModelTypeFromSpecifics(entity_specifics);
   string client_defined_unique_tag = GenerateSyncableHash(model_type, name);
   string id = FakeServerEntity::CreateId(model_type, client_defined_unique_tag);
   return scoped_ptr<FakeServerEntity>(