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/engine/build_commit_command.h | |
| 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/engine/build_commit_command.h')
| -rw-r--r-- | sync/engine/build_commit_command.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sync/engine/build_commit_command.h b/sync/engine/build_commit_command.h index 0adab28..c1712a6 100644 --- a/sync/engine/build_commit_command.h +++ b/sync/engine/build_commit_command.h @@ -9,7 +9,6 @@ #include "base/compiler_specific.h" #include "base/gtest_prod_util.h" #include "sync/engine/syncer_command.h" -#include "sync/engine/syncproto.h" #include "sync/syncable/entry_kernel.h" namespace syncer { @@ -37,7 +36,7 @@ class BuildCommitCommand : public SyncerCommand { // The commit_message parameter is an output parameter which will contain the // fully initialized commit message once ExecuteImpl() has been called. BuildCommitCommand(const sessions::OrderedCommitSet& batch_commit_set, - ClientToServerMessage* commit_message); + sync_pb::ClientToServerMessage* commit_message); virtual ~BuildCommitCommand(); // SyncerCommand implementation. @@ -52,7 +51,7 @@ class BuildCommitCommand : public SyncerCommand { static int64 GetGap(); void AddExtensionsActivityToMessage(sessions::SyncSession* session, - CommitMessage* message); + sync_pb::CommitMessage* message); // Helper for computing position. Find the numeric position value // of the closest already-synced entry. |direction| must be one of // NEXT_ID or PREV_ID; this parameter controls the search direction. @@ -70,7 +69,7 @@ class BuildCommitCommand : public SyncerCommand { const sessions::OrderedCommitSet& batch_commit_set_; // Output parameter; see constructor comment. - ClientToServerMessage* commit_message_; + sync_pb::ClientToServerMessage* commit_message_; }; } // namespace syncer |