Fix the false-positive detection of commit errors

chrome/browser/sync/sessions/status_controller.h

 // 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.
 
 // StatusController handles all counter and status related number crunching and
 // state tracking on behalf of a SyncSession.  It 'controls' the model data
 // defined in session_state.h.  The most important feature of StatusController
 // is the ScopedModelSafetyRestriction. When one of these is active, the
 // underlying data set exposed via accessors is swapped out to the appropriate
 // set for the restricted ModelSafeGroup behind the scenes.  For example, if
@@ skipping 84 matching lines @@
   void set_updates_request_types(const syncable::ModelTypeBitSet& value) {
     shared_.updates_request_types = value;
   }
   const ClientToServerResponse& updates_response() const {
     return shared_.updates_response;
   }
   ClientToServerResponse* mutable_updates_response() {
     return &shared_.updates_response;
   }
 
+  void set_last_download_updates_result(const SyncOperationResult result) {
+    shared_.last_download_updates_result = result;
+  }
+  void set_last_post_commit_result(const SyncOperationResult result) {
+    shared_.last_post_commit_result = result;
+  }
+  void set_last_clear_data_result(const SyncOperationResult result) {
+    shared_.last_clear_data_result = result;
+  }
+  SyncOperationResult last_download_updates_result() const {
+    return shared_.last_download_updates_result;
+  }
+  SyncOperationResult last_post_commit_result() const {
+    return shared_.last_post_commit_result;
+  }
+  SyncOperationResult last_clear_data_result() const {
+    return shared_.last_clear_data_result;
+  }
+
   // Errors and SyncerStatus.
   const ErrorCounters& error() const {
     return shared_.error.value();
   }
   const SyncerStatus& syncer_status() const {
     return shared_.syncer_status.value();
   }
 
   // Changelog related state.
   int64 num_server_changes_remaining() const {
@@ skipping 107 matching lines @@
   void set_syncer_stuck(bool syncer_stuck);
   void set_num_successful_bookmark_commits(int value);
   void increment_num_successful_commits();
   void increment_num_successful_bookmark_commits();
   void increment_num_updates_downloaded_by(int value);
   void increment_num_tombstone_updates_downloaded_by(int value);
   void set_types_needing_local_migration(const syncable::ModelTypeSet& types);
   void set_unsynced_handles(const std::vector<int64>& unsynced_handles);
   void increment_num_local_overwrites();
   void increment_num_server_overwrites();
-  void set_sync_protocol_error(const SyncProtocolError& error);
+  void set_sync_protocol_error(const SyncOperationResult& error);
 
   void set_commit_set(const OrderedCommitSet& commit_set);
   void update_conflict_sets_built(bool built);
   void update_conflicts_resolved(bool resolved);
   void reset_conflicts_resolved();
   void set_items_committed();
 
   void SetSyncInProgressAndUpdateStartTime(bool sync_in_progress);
 
  private:
@@ skipping 46 matching lines @@
   }
  private:
   StatusController* status_;
   DISALLOW_COPY_AND_ASSIGN(ScopedModelSafeGroupRestriction);
 };
 
 }
 }
 
 #endif  // CHROME_BROWSER_SYNC_SESSIONS_STATUS_CONTROLLER_H_