From 447a5b6333539c309e015ee8f98ff6d9e131fa85 Mon Sep 17 00:00:00 2001 From: "rlarocque@chromium.org" Date: Thu, 12 Jul 2012 18:15:45 +0000 Subject: Remove syncproto.h Replace sync/engine/syncproto.h with sync/syncable/syncable_proto_util.h and .cc. The tasks that used to be performed by member functions of the syncer:: proto wrapper classes are now handled by static member functions. Unfortunately, serialization and de-serialization of syncable::Id to/from proto fields has gotten a bit uglier. On the other hand, it's now much less magical and mysterious. The test intended to prevent regressions of crbug.com/134715 has been replaced with a DCHECK. We'll have to rely on it to ensure that the protocol_version field is always explicitly set. BUG=136454 TEST= Review URL: https://chromiumcodereview.appspot.com/10735041 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@146393 0039d316-1c4b-4281-b951-d872f2087c98 --- sync/engine/syncer.h | 1 - 1 file changed, 1 deletion(-) (limited to 'sync/engine/syncer.h') diff --git a/sync/engine/syncer.h b/sync/engine/syncer.h index 6d05d43..81271ab 100644 --- a/sync/engine/syncer.h +++ b/sync/engine/syncer.h @@ -13,7 +13,6 @@ #include "base/synchronization/lock.h" #include "sync/engine/conflict_resolver.h" #include "sync/engine/syncer_types.h" -#include "sync/engine/syncproto.h" #include "sync/internal_api/public/base/model_type.h" #include "sync/sessions/sync_session.h" #include "sync/util/extensions_activity_monitor.h" -- cgit v1.1