[Sync] Made some sync session member functions const

chrome/browser/sync/engine/conflict_resolver.cc

 // Copyright (c) 2011 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 "chrome/browser/sync/engine/conflict_resolver.h"
 
 #include <algorithm>
 #include <map>
 #include <set>
 
@@ skipping 437 matching lines @@
 
   status->set_syncer_stuck(true);
   UMA_HISTOGRAM_COUNTS("Sync.SyncerConflictStuck", 1);
 
   return true;
   // TODO(sync): If we're stuck for a while we need to alert the user, clear
   // cache or reset syncing. At the very least we should stop trying something
   // that's obviously not working.
 }
 
-bool ConflictResolver::ResolveSimpleConflicts(const ScopedDirLookup& dir,
-                                              StatusController* status) {
+bool ConflictResolver::ResolveSimpleConflicts(
+    const ScopedDirLookup& dir,
+    const ConflictProgress& progress,
+    sessions::StatusController* status) {
   WriteTransaction trans(FROM_HERE, syncable::SYNCER, dir);
   bool forward_progress = false;
-  const ConflictProgress& progress = status->conflict_progress();
   // First iterate over simple conflict items (those that belong to no set).
   set<Id>::const_iterator conflicting_item_it;
-  for (conflicting_item_it = progress.ConflictingItemsBeginConst();
+  for (conflicting_item_it = progress.ConflictingItemsBegin();
        conflicting_item_it != progress.ConflictingItemsEnd();
        ++conflicting_item_it) {
     Id id = *conflicting_item_it;
     map<Id, ConflictSet*>::const_iterator item_set_it =
         progress.IdToConflictSetFind(id);
     if (item_set_it == progress.IdToConflictSetEnd() ||
         0 == item_set_it->second) {
       // We have a simple conflict.
       switch (ProcessSimpleConflict(&trans, id, status)) {
         case NO_SYNC_PROGRESS:
@@ skipping 14 matching lines @@
   while (i != simple_conflict_count_map_.end()) {
     if (0 == --(i->second))
       simple_conflict_count_map_.erase(i++);
     else
       ++i;
   }
   return forward_progress;
 }
 
 bool ConflictResolver::ResolveConflicts(const ScopedDirLookup& dir,
-                                        StatusController* status) {
-  const ConflictProgress& progress = status->conflict_progress();
+                                        const ConflictProgress& progress,
+                                        sessions::StatusController* status) {
   bool rv = false;
-  if (ResolveSimpleConflicts(dir, status))
+  if (ResolveSimpleConflicts(dir, progress, status))
     rv = true;
   WriteTransaction trans(FROM_HERE, syncable::SYNCER, dir);
   set<ConflictSet*>::const_iterator set_it;
   for (set_it = progress.ConflictSetsBegin();
        set_it != progress.ConflictSetsEnd();
        set_it++) {
     ConflictSet* conflict_set = *set_it;
     ConflictSetCountMapKey key = GetSetKey(conflict_set);
     conflict_set_count_map_[key] += 2;
     int conflict_count = conflict_set_count_map_[key];
@@ skipping 24 matching lines @@
       conflict_set_count_map_.erase(i++);
       // METRIC self resolved conflict sets ++.
     } else {
       ++i;
     }
   }
   return rv;
 }
 
 }  // namespace browser_sync