Remove syncproto.h

sync/engine/commit.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "sync/engine/commit.h"
 
 #include "base/debug/trace_event.h"
 #include "sync/engine/build_commit_command.h"
 #include "sync/engine/get_commit_ids_command.h"
 #include "sync/engine/process_commit_response_command.h"
@@ skipping 45 matching lines @@
 // The OrderedCommitSet parameter is an output parameter which will contain
 // the set of all items which are to be committed.  The number of items in
 // the set shall not exceed the maximum batch size.  (The default batch size
 // is currently 25, though it can be overwritten by the server.)
 //
 // The ClientToServerMessage parameter is an output parameter which will contain
 // the commit message which should be sent to the server.  It is valid iff the
 // 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());
   sessions::ScopedSetSessionWriteTransaction set_trans(session, &trans);
 
   // Fetch the items to commit.
   const size_t batch_size = session->context()->max_commit_batch_size();
   GetCommitIdsCommand get_commit_ids_command(batch_size, commit_set);
   get_commit_ids_command.Execute(session);
 
   DVLOG(1) << "Commit message will contain " << commit_set->Size() << " items.";
   if (commit_set->Empty()) {
     return false;
   }
 
   // Serialize the message.
   BuildCommitCommand build_commit_command(*commit_set, commit_message);
   build_commit_command.Execute(session);
 
   SetSyncingBits(session->write_transaction(), *commit_set);
   return true;
 }
 
 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");
     const SyncerError post_result = SyncerProtoUtil::PostClientToServerMessage(
         commit_message, &commit_response, session);
     TRACE_EVENT_END0("sync", "PostCommit");
 
     if (post_result != SYNCER_OK) {
       LOG(WARNING) << "Post commit failed";
       return post_result;
@@ skipping 36 matching lines @@
                                 sessions::SyncSession* session) {
   sessions::OrderedCommitSet commit_set(session->routing_info());
   SyncerError result = BuildAndPostCommitsImpl(syncer, session, &commit_set);
   if (result != SYNCER_OK) {
     ClearSyncingBits(session->context()->directory(), commit_set);
   }
   return result;
 }
 
 }  // namespace syncer