FYI: Remove PerModelSafeGroupState + move ConflictResolution

sync/sessions/sync_session.h

Index: sync/sessions/sync_session.h
diff --git a/sync/sessions/sync_session.h b/sync/sessions/sync_session.h
index 461d98ea8440b2d71194de0ae45ecafdb2875b87..6b7b990615c3b576c42116e546ef6dde98a304d3 100644
--- a/sync/sessions/sync_session.h
+++ b/sync/sessions/sync_session.h
@@ -27,7 +27,6 @@
 #include "sync/internal_api/public/engine/model_safe_worker.h"
 #include "sync/internal_api/public/sessions/sync_session_snapshot.h"
 #include "sync/sessions/ordered_commit_set.h"
-#include "sync/sessions/session_state.h"
 #include "sync/sessions/status_controller.h"
 #include "sync/sessions/sync_session_context.h"
 #include "sync/util/extensions_activity_monitor.h"
@@ -108,10 +107,6 @@ class SyncSession {
   // Builds and sends a snapshot to the session context's listeners.
   void SendEventNotification(SyncEngineEvent::EventCause cause);
 
-  // Returns true if this session contains data that should go through the sync
-  // engine again.
-  bool HasMoreToSync() const;
-
   // Returns true if we completely ran the session without errors.
   //
   // There are many errors that could prevent a sync cycle from succeeding.
@@ -124,8 +119,7 @@ class SyncSession {
   // or a notification) has been properly serviced.
   //
   // This function also returns false if SyncShare has not been called on this
-  // session yet, or if ResetTransientState() has been called on this session
-  // since the last call to SyncShare.
+  // session yet.
   bool Succeeded() const;
 
   // Returns true if we reached the server successfully and the server did not
@@ -145,10 +139,6 @@ class SyncSession {
   // syncing.
   void RebaseRoutingInfoWithLatest(const SyncSession& session);
 
-  // Should be called any time |this| is being re-used in a new call to
-  // SyncShare (e.g., HasMoreToSync returned true).
-  void PrepareForAnotherSyncCycle();
-
   // TODO(akalin): Split this into context() and mutable_context().
   SyncSessionContext* context() const { return context_; }
   Delegate* delegate() const { return delegate_; }
@@ -174,12 +164,6 @@ class SyncSession {
   // Returns the set of groups which have enabled types.
   const std::set<ModelSafeGroup>& GetEnabledGroups() const;
 
-  // Returns the set of enabled groups that have conflicts.
-  std::set<ModelSafeGroup> GetEnabledGroupsWithConflicts() const;
-
-  // Returns the set of enabled groups that have verified updates.
-  std::set<ModelSafeGroup> GetEnabledGroupsWithVerifiedUpdates() const;
-
   // Mark the session has having finished all the sync steps it needed.
   void SetFinished();
 
@@ -220,8 +204,7 @@ class SyncSession {
   // |routing_info_|.
   std::set<ModelSafeGroup> enabled_groups_;
 
-  // Whether this session has reached its last step or not. Gets reset on each
-  // new cycle (via PrepareForAnotherSyncCycle).
+  // Whether this session has reached its last step or not.
   bool finished_;
 
   DISALLOW_COPY_AND_ASSIGN(SyncSession);