[Sync] Made some sync session member functions const

chrome/browser/sync/engine/process_commit_response_command.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/process_commit_response_command.h"
 
 #include <set>
 #include <string>
 #include <vector>
 
@@ skipping 50 matching lines @@
 
 bool ProcessCommitResponseCommand::ModelNeutralExecuteImpl(
     sessions::SyncSession* session) {
   ScopedDirLookup dir(session->context()->directory_manager(),
                       session->context()->account_name());
   if (!dir.good()) {
     LOG(ERROR) << "Scoped dir lookup failed!";
     return false;
   }
 
-  StatusController* status = session->status_controller();
-  const ClientToServerResponse& response(status->commit_response());
-  const vector<syncable::Id>& commit_ids(status->commit_ids());
+  const StatusController& status = session->status_controller();
+  const ClientToServerResponse& response(status.commit_response());
+  const vector<syncable::Id>& commit_ids(status.commit_ids());
 
   if (!response.has_commit()) {
     // TODO(sync): What if we didn't try to commit anything?
     LOG(WARNING) << "Commit response has no commit body!";
-    IncrementErrorCounters(status);
+    IncrementErrorCounters(session->mutable_status_controller());
     return false;
   }
 
   const CommitResponse& cr = response.commit();
   int commit_count = commit_ids.size();
   if (cr.entryresponse_size() != commit_count) {
     LOG(ERROR) << "Commit response has wrong number of entries! Expected:" <<
                commit_count << " Got:" << cr.entryresponse_size();
     for (int i = 0 ; i < cr.entryresponse_size() ; i++) {
       LOG(ERROR) << "Response #" << i << " Value: " <<
                  cr.entryresponse(i).response_type();
       if (cr.entryresponse(i).has_error_message())
         LOG(ERROR) << "  " << cr.entryresponse(i).error_message();
     }
-    IncrementErrorCounters(status);
+    IncrementErrorCounters(session->mutable_status_controller());
     return false;
   }
   return true;
 }
 
 void ProcessCommitResponseCommand::ModelChangingExecuteImpl(
     SyncSession* session) {
   ProcessCommitResponse(session);
   ExtensionsActivityMonitor* monitor = session->context()->extensions_monitor();
-  if (session->status_controller()->HasBookmarkCommitActivity() &&
-      session->status_controller()->syncer_status()
+  if (session->status_controller().HasBookmarkCommitActivity() &&
+      session->status_controller().syncer_status()
           .num_successful_bookmark_commits == 0) {
     monitor->PutRecords(session->extensions_activity());
     session->mutable_extensions_activity()->clear();
   }
 }
 
 void ProcessCommitResponseCommand::ProcessCommitResponse(
     SyncSession* session) {
   // TODO(sync): This function returns if it sees problems. We probably want
   // to flag the need for an update or similar.
   ScopedDirLookup dir(session->context()->directory_manager(),
                       session->context()->account_name());
   if (!dir.good()) {
     LOG(ERROR) << "Scoped dir lookup failed!";
     return;
   }
 
-  StatusController* status = session->status_controller();
+  StatusController* status = session->mutable_status_controller();
   const ClientToServerResponse& response(status->commit_response());
   const CommitResponse& cr = response.commit();
   const sync_pb::CommitMessage& commit_message =
       status->commit_message().commit();
 
   // If we try to commit a parent and child together and the parent conflicts
   // the child will have a bad parent causing an error. As this is not a
   // critical error, we trap it and don't LOG(ERROR). To enable this we keep
   // a map of conflicting new folders.
   int transient_error_commits = 0;
@@ skipping 19 matching lines @@
           break;
         case CommitResponse::CONFLICT:
           ++conflicting_commits;
           // Only server CONFLICT responses will activate conflict resolution.
           conflict_progress->AddConflictingItemById(
               status->GetCommitIdAt(proj[i]));
           break;
         case CommitResponse::SUCCESS:
           // TODO(sync): worry about sync_rate_ rate calc?
           ++successes;
-          if (status->GetCommitIdModelTypeAt(proj[i]) == syncable::BOOKMARKS)
+          if (status->GetCommitModelTypeAt(proj[i]) == syncable::BOOKMARKS)
             status->increment_num_successful_bookmark_commits();
           status->increment_num_successful_commits();
           break;
         case CommitResponse::OVER_QUOTA:
           // We handle over quota like a retry, which is same as transient.
         case CommitResponse::RETRY:
         case CommitResponse::TRANSIENT_ERROR:
           // TODO(tim): Now that we have SyncSession::Delegate, we
           // should plumb this directly for exponential backoff purposes rather
           // than trying to infer from HasMoreToSync(). See
@@ skipping 312 matching lines @@
   // been recursively deleted.
   // TODO(nick): Here, commit_message.deleted() would be more correct than
   // local_entry->Get(IS_DEL).  For example, an item could be renamed, and then
   // deleted during the commit of the rename.  Unit test & fix.
   if (local_entry->Get(IS_DIR) && local_entry->Get(IS_DEL)) {
     deleted_folders->insert(local_entry->Get(ID));
   }
 }
 
 }  // namespace browser_sync