sync: Loop committing items without downloading updates (v2)

sync/engine/process_commit_response_command.h

 // 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.
 
 #ifndef SYNC_ENGINE_PROCESS_COMMIT_RESPONSE_COMMAND_H_
 #define SYNC_ENGINE_PROCESS_COMMIT_RESPONSE_COMMAND_H_
 #pragma once
 
 #include <set>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "sync/engine/model_changing_syncer_command.h"
 #include "sync/engine/syncproto.h"
 
 namespace syncable {
 class Id;
 class WriteTransaction;
 class MutableEntry;
+class Directory;
 }
 
 namespace browser_sync {
 
+namespace sessions {
+class OrderedCommitSet;
+}
+
+// A class that processes the server's response to our commmit attempt.  Note
+// that some of the preliminary processing is performed in
+// PostClientToServerMessage command.
+//
+// As part of processing the commit response, this command will modify sync
+// entries.  It can rename items, update their versions, etc.
+//
+// This command will return a non-SYNCER_OK value if an error occurred while
+// processing the response, or if the server's response indicates that it had
+// trouble processing the request.
+//
+// See SyncerCommand documentation for more info.
 class ProcessCommitResponseCommand : public ModelChangingSyncerCommand {
  public:
 
-  ProcessCommitResponseCommand();
+  // The commit_set parameter contains references to all the items which were
+  // to be committed in this batch.
+  //
+  // The commmit_message parameter contains the message that was sent to the
+  // server.
+  //
+  // The commit_response parameter contains the response received from the
+  // server.  This may be uninitialized if we were unable to contact the server
+  // or a serious error was encountered.
+  ProcessCommitResponseCommand(
+      const sessions::OrderedCommitSet& commit_set,
+      const ClientToServerMessage& commit_message,
+      const ClientToServerResponse& commit_response);
   virtual ~ProcessCommitResponseCommand();
 
  protected:
   // ModelChangingSyncerCommand implementation.
   virtual std::set<ModelSafeGroup> GetGroupsToChange(
       const sessions::SyncSession& session) const OVERRIDE;
   virtual SyncerError ModelNeutralExecuteImpl(
       sessions::SyncSession* session) OVERRIDE;
   virtual SyncerError ModelChangingExecuteImpl(
       sessions::SyncSession* session) OVERRIDE;
 
  private:
   CommitResponse::ResponseType ProcessSingleCommitResponse(
       syncable::WriteTransaction* trans,
       const sync_pb::CommitResponse_EntryResponse& pb_commit_response,
       const sync_pb::SyncEntity& pb_committed_entry,
       const syncable::Id& pre_commit_id,
-      std::set<syncable::Id>* conflicting_new_directory_ids,
       std::set<syncable::Id>* deleted_folders);
 
   // Actually does the work of execute.
   SyncerError ProcessCommitResponse(sessions::SyncSession* session);
 
   void ProcessSuccessfulCommitResponse(
       const sync_pb::SyncEntity& committed_entry,
       const CommitResponse_EntryResponse& entry_response,
       const syncable::Id& pre_commit_id, syncable::MutableEntry* local_entry,
       bool syncing_was_set, std::set<syncable::Id>* deleted_folders);
@@ skipping 29 matching lines @@
   void OverrideClientFieldsAfterCommit(
       const sync_pb::SyncEntity& committed_entry,
       const CommitResponse_EntryResponse& entry_response,
       syncable::MutableEntry* local_entry);
 
   // Helper to extract the final name from the protobufs.
   const std::string& GetResultingPostCommitName(
       const sync_pb::SyncEntity& committed_entry,
       const CommitResponse_EntryResponse& entry_response);
 
+  // Helper to clean up in case of failure.
+  void ClearSyncingBits(
+      syncable::Directory *dir,
+      const std::vector<syncable::Id>& commit_ids);
+
+  const sessions::OrderedCommitSet& commit_set_;
+  const ClientToServerMessage& commit_message_;
+  const ClientToServerResponse& commit_response_;
+
   DISALLOW_COPY_AND_ASSIGN(ProcessCommitResponseCommand);
 };
 
 }  // namespace browser_sync
 
 #endif  // SYNC_ENGINE_PROCESS_COMMIT_RESPONSE_COMMAND_H_