| Index: components/sync/engine_impl/loopback_server/persistent_unique_client_entity.cc
|
| diff --git a/components/sync/engine_impl/loopback_server/persistent_unique_client_entity.cc b/components/sync/engine_impl/loopback_server/persistent_unique_client_entity.cc
|
| index e6a8c07722114b0c089a04e78e4ccfc7e8673dfd..402d817dc4bb8a2a0429c9880a2204d64825ff92 100644
|
| --- a/components/sync/engine_impl/loopback_server/persistent_unique_client_entity.cc
|
| +++ b/components/sync/engine_impl/loopback_server/persistent_unique_client_entity.cc
|
| @@ -14,14 +14,9 @@
|
| #include "components/sync/engine_impl/loopback_server/loopback_server_entity.h"
|
| #include "components/sync/engine_impl/loopback_server/persistent_permanent_entity.h"
|
| #include "components/sync/protocol/sync.pb.h"
|
| -#include "components/sync/syncable/syncable_util.h"
|
|
|
| using std::string;
|
|
|
| -using syncer::GetModelTypeFromSpecifics;
|
| -using syncer::ModelType;
|
| -using syncer::syncable::GenerateSyncableHash;
|
| -
|
| namespace syncer {
|
|
|
| PersistentUniqueClientEntity::PersistentUniqueClientEntity(
|
| @@ -48,8 +43,7 @@ std::unique_ptr<LoopbackServerEntity> PersistentUniqueClientEntity::Create(
|
| CHECK(client_entity.has_client_defined_unique_tag())
|
| << "A PersistentUniqueClientEntity must have a client-defined unique "
|
| "tag.";
|
| - ModelType model_type =
|
| - syncer::GetModelTypeFromSpecifics(client_entity.specifics());
|
| + ModelType model_type = GetModelTypeFromSpecifics(client_entity.specifics());
|
| string id = EffectiveIdForClientTaggedEntity(client_entity);
|
| return std::unique_ptr<LoopbackServerEntity>(new PersistentUniqueClientEntity(
|
| id, model_type, client_entity.version(), client_entity.name(),
|
| @@ -61,7 +55,7 @@ std::unique_ptr<LoopbackServerEntity> PersistentUniqueClientEntity::Create(
|
| std::string PersistentUniqueClientEntity::EffectiveIdForClientTaggedEntity(
|
| const sync_pb::SyncEntity& entity) {
|
| return LoopbackServerEntity::CreateId(
|
| - syncer::GetModelTypeFromSpecifics(entity.specifics()),
|
| + GetModelTypeFromSpecifics(entity.specifics()),
|
| entity.client_defined_unique_tag());
|
| }
|
|
|
|
|