diff options
| author | rlarocque@chromium.org <rlarocque@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-12 18:15:45 +0000 |
|---|---|---|
| committer | rlarocque@chromium.org <rlarocque@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-12 18:15:45 +0000 |
| commit | 447a5b6333539c309e015ee8f98ff6d9e131fa85 (patch) | |
| tree | 4357764ce00fdfbff7809d348a16a5f601bd3b08 /sync/test | |
| parent | 13d5e1af907ece2266b391c322344fb0af43d9f0 (diff) | |
| download | chromium_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/test')
| -rw-r--r-- | sync/test/engine/mock_connection_manager.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sync/test/engine/mock_connection_manager.cc b/sync/test/engine/mock_connection_manager.cc index cf5ab20e..58bd0d1 100644 --- a/sync/test/engine/mock_connection_manager.cc +++ b/sync/test/engine/mock_connection_manager.cc @@ -19,6 +19,7 @@ using std::map; using std::string; +using sync_pb::ClientToServerMessage; using sync_pb::CommitMessage; using sync_pb::CommitResponse; using sync_pb::GetUpdatesMessage; @@ -81,7 +82,7 @@ bool MockConnectionManager::PostBufferToPath(PostBufferParams* params, CHECK(post.has_protocol_version()); last_request_.CopyFrom(post); client_stuck_ = post.sync_problem_detected(); - ClientToServerResponse response; + sync_pb::ClientToServerResponse response; response.Clear(); if (directory_) { |