Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(140)

Unified Diff: components/sync/engine_impl/loopback_server/persistent_unique_client_entity.cc

Issue 2502253003: [Sync] Move GenerateSyncableHash to base. (Closed)
Patch Set: Keep full syncable/ DEP. Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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());
}
« no previous file with comments | « components/sync/base/hash_util_unittest.cc ('k') | components/sync/engine_impl/model_type_worker_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698