sync: Implement per-type commit interface

sync/engine/process_commit_response_command.h

 // Copyright 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_
 
 #include <set>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "sync/base/sync_export.h"
 #include "sync/engine/syncer_command.h"
 #include "sync/protocol/sync.pb.h"
 
 namespace syncer {
 
-namespace sessions {
-class OrderedCommitSet;
-}
-
 namespace syncable {
 class Id;
 class ModelNeutralWriteTransaction;
 class ModelNeutralMutableEntry;
 class Directory;
 }
 
 // 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 change their IDs, 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 SYNC_EXPORT_PRIVATE ProcessCommitResponseCommand : public SyncerCommand {
+class SYNC_EXPORT_PRIVATE ProcessCommitResponseCommand {
  public:
-
-  // 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 sync_pb::ClientToServerMessage& commit_message,
-      const sync_pb::ClientToServerResponse& commit_response);
-  virtual ~ProcessCommitResponseCommand();
-
- protected:
-  // SyncerCommand implementation.
-  virtual SyncerError ExecuteImpl(sessions::SyncSession* session) OVERRIDE;
-
- private:
-  sync_pb::CommitResponse::ResponseType ProcessSingleCommitResponse(
+  static sync_pb::CommitResponse::ResponseType ProcessSingleCommitResponse(

[Nicolas Zea, 2013/10/09 00:17:39]

Again, seems odd to have a class with nothing but static functions.

[rlarocque, 2013/10/09 20:00:19]

I agree.

I could make these functions standalone, but I don't think that really solves
the problem.  Eventually, I'd like to make these functions standalone then find
them a new home.

       syncable::ModelNeutralWriteTransaction* trans,
       const sync_pb::CommitResponse_EntryResponse& pb_commit_response,
       const sync_pb::SyncEntity& pb_committed_entry,
       int64 metahandle,
       std::set<syncable::Id>* deleted_folders);
 
-  void ProcessSuccessfulCommitResponse(
+ private:
+  static void ProcessSuccessfulCommitResponse(
       const sync_pb::SyncEntity& committed_entry,
       const sync_pb::CommitResponse_EntryResponse& entry_response,
       const syncable::Id& pre_commit_id,
       syncable::ModelNeutralMutableEntry* local_entry,
       bool syncing_was_set, std::set<syncable::Id>* deleted_folders);
 
   // Update the BASE_VERSION and SERVER_VERSION, post-commit.
   // Helper for ProcessSuccessfulCommitResponse.
-  bool UpdateVersionAfterCommit(
+  static bool UpdateVersionAfterCommit(
       const sync_pb::SyncEntity& committed_entry,
       const sync_pb::CommitResponse_EntryResponse& entry_response,
       const syncable::Id& pre_commit_id,
       syncable::ModelNeutralMutableEntry* local_entry);
 
   // If the server generated an ID for us during a commit, apply the new ID.
   // Helper for ProcessSuccessfulCommitResponse.
-  bool ChangeIdAfterCommit(
+  static bool ChangeIdAfterCommit(
       const sync_pb::CommitResponse_EntryResponse& entry_response,
       const syncable::Id& pre_commit_id,
       syncable::ModelNeutralMutableEntry* local_entry);
 
   // Update the SERVER_ fields to reflect the server state after committing.
   // Helper for ProcessSuccessfulCommitResponse.
-  void UpdateServerFieldsAfterCommit(
+  static void UpdateServerFieldsAfterCommit(
       const sync_pb::SyncEntity& committed_entry,
       const sync_pb::CommitResponse_EntryResponse& entry_response,
       syncable::ModelNeutralMutableEntry* local_entry);
 
   // Helper to extract the final name from the protobufs.
-  const std::string& GetResultingPostCommitName(
+  static const std::string& GetResultingPostCommitName(
       const sync_pb::SyncEntity& committed_entry,
       const sync_pb::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 sync_pb::ClientToServerMessage& commit_message_;
-  const sync_pb::ClientToServerResponse& commit_response_;
-
-  DISALLOW_COPY_AND_ASSIGN(ProcessCommitResponseCommand);
+  DISALLOW_IMPLICIT_CONSTRUCTORS(ProcessCommitResponseCommand);
 };
 
 }  // namespace syncer
 
 #endif  // SYNC_ENGINE_PROCESS_COMMIT_RESPONSE_COMMAND_H_