summaryrefslogtreecommitdiffstats
path: root/sync/engine/syncer.h
diff options
context:
space:
mode:
authorrlarocque@chromium.org <rlarocque@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-12 18:15:45 +0000
committerrlarocque@chromium.org <rlarocque@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-12 18:15:45 +0000
commit447a5b6333539c309e015ee8f98ff6d9e131fa85 (patch)
tree4357764ce00fdfbff7809d348a16a5f601bd3b08 /sync/engine/syncer.h
parent13d5e1af907ece2266b391c322344fb0af43d9f0 (diff)
downloadchromium_src-447a5b6333539c309e015ee8f98ff6d9e131fa85.zip
chromium_src-447a5b6333539c309e015ee8f98ff6d9e131fa85.tar.gz
chromium_src-447a5b6333539c309e015ee8f98ff6d9e131fa85.tar.bz2
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
Diffstat (limited to 'sync/engine/syncer.h')
-rw-r--r--sync/engine/syncer.h1
1 files changed, 0 insertions, 1 deletions
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"