Sync: Generalize entity injection in Android tests

sync/test/fake_server/unique_client_entity.cc

 // 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.
 
 #include "sync/test/fake_server/unique_client_entity.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/guid.h"
 #include "base/memory/scoped_ptr.h"
 #include "sync/internal_api/public/base/model_type.h"
 #include "sync/protocol/sync.pb.h"
 #include "sync/syncable/syncable_util.h"
 #include "sync/test/fake_server/fake_server_entity.h"
 #include "sync/test/fake_server/permanent_entity.h"
 
 using std::string;
 
+using syncer::GetModelTypeFromSpecifics;
 using syncer::ModelType;
 using syncer::syncable::GenerateSyncableHash;
 
 namespace fake_server {
 
 namespace {
 
 // A version must be passed when creating a FakeServerEntity, but this value
 // is overrideen immediately when saving the entity in FakeServer.
 const int64 kUnusedVersion = 0L;
@@ skipping 33 matching lines @@
                                 client_entity.version(),
                                 client_entity.name(),
                                 client_entity.client_defined_unique_tag(),
                                 client_entity.specifics(),
                                 client_entity.ctime(),
                                 client_entity.mtime());
 }
 
 // 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, base::GenerateGUID());
   return scoped_ptr<FakeServerEntity>(
       new UniqueClientEntity(id,
                              model_type,
                              kUnusedVersion,
                              name,
                              client_defined_unique_tag,
                              entity_specifics,
                              kDefaultTime,
@@ skipping 28 matching lines @@
 
 bool UniqueClientEntity::IsDeleted() const {
   return false;
 }
 
 bool UniqueClientEntity::IsFolder() const {
   return false;
 }
 
 }  // namespace fake_server