Remove syncproto.h

sync/engine/commit.cc

Index: sync/engine/commit.cc
diff --git a/sync/engine/commit.cc b/sync/engine/commit.cc
index 02bee1eed2b48e76c7e2b3fccbe1d6d8c79ba882..ad18ae6315412ffadde5f0095a8e906b35957474 100644
--- a/sync/engine/commit.cc
+++ b/sync/engine/commit.cc
@@ -63,13 +63,12 @@ void ClearSyncingBits(syncable::Directory* dir,
 // return value of this function is true.
 bool PrepareCommitMessage(sessions::SyncSession* session,
                           sessions::OrderedCommitSet* commit_set,
-                          ClientToServerMessage* commit_message) {
+                          sync_pb::ClientToServerMessage* commit_message) {
   TRACE_EVENT0("sync", "PrepareCommitMessage");
 
   commit_set->Clear();
   commit_message->Clear();
 
-  // TODO(134769): This is a temporary fix for crbug.com/134715.
   commit_message->set_protocol_version(commit_message->protocol_version());

[akalin, 2012/07/11 01:42:22]

im guessing this is what replaces the call in the old syncproto.h?

[rlarocque, 2012/07/11 19:22:16]

Yes.  We want to set the protocol version to the current default protocol
version.  We do it that way because it makes it easier to share the constant
between the client and server.

Come to think of it, though, I could rewrite this a bit more clearly.  Will fix.

 
   WriteTransaction trans(FROM_HERE, SYNCER, session->context()->directory());
@@ -96,10 +95,10 @@ bool PrepareCommitMessage(sessions::SyncSession* session,
 SyncerError BuildAndPostCommitsImpl(Syncer* syncer,
                                     sessions::SyncSession* session,
                                     sessions::OrderedCommitSet* commit_set) {
-  ClientToServerMessage commit_message;
+  sync_pb::ClientToServerMessage commit_message;
   while (!syncer->ExitRequested() &&
          PrepareCommitMessage(session, commit_set, &commit_message)) {
-    ClientToServerResponse commit_response;
+    sync_pb::ClientToServerResponse commit_response;
 
     DVLOG(1) << "Sending commit message.";
     TRACE_EVENT_BEGIN0("sync", "PostCommit");