Fix the false-positive detection of commit errors

chrome/browser/sync/sessions/session_state.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.
 
 // The 'sessions' namespace comprises all the pieces of state that are
 // combined to form a SyncSession instance. In that way, it can be thought of
 // as an extension of the SyncSession type itself. Session scoping gives
 // context to things like "conflict progress", "update progress", etc, and the
 // separation this file provides allows clients to only include the parts they
 // need rather than the entire session stack.
@@ skipping 10 matching lines @@
 
 #include "base/basictypes.h"
 #include "chrome/browser/sync/engine/syncer_types.h"
 #include "chrome/browser/sync/engine/syncproto.h"
 #include "chrome/browser/sync/sessions/ordered_commit_set.h"
 #include "chrome/browser/sync/protocol/sync_protocol_error.h"
 #include "chrome/browser/sync/syncable/model_type.h"
 #include "chrome/browser/sync/syncable/model_type_payload_map.h"
 #include "chrome/browser/sync/syncable/syncable.h"
 
+#include "chrome/browser/sync/engine/syncer_proto_util.h"
+
 namespace base {
 class DictionaryValue;
 }
 
 namespace syncable {
 class DirectoryManager;
 }
 
 namespace browser_sync {
 namespace sessions {
@@ skipping 61 matching lines @@
   // Number of commits hitting transient errors since the last successful
   // commit.
   int consecutive_transient_error_commits;
 
   // Incremented when get_updates fails, commit fails, and when hitting
   // transient errors. When any of these succeed, this counter is reset.
   // TODO(chron): Reduce number of weird counters we use.
   int consecutive_errors;
 
   // Any protocol errors that we received during this sync session.
-  SyncProtocolError sync_protocol_error;
+  SyncOperationResult sync_protocol_error; // FIXME: umm... really?  Is this used?
 };
 
 // Caller takes ownership of the returned dictionary.
 base::DictionaryValue* DownloadProgressMarkersToValue(
     const std::string
         (&download_progress_markers)[syncable::MODEL_TYPE_COUNT]);
 
 // An immutable snapshot of state from a SyncSession.  Convenient to use as
 // part of notifications as it is inherently thread-safe.
 struct SyncSessionSnapshot {
@@ skipping 192 matching lines @@
   explicit AllModelTypeState(bool* dirty_flag);
   ~AllModelTypeState();
 
   // Commits for all model types are bundled together into a single message.
   ClientToServerMessage commit_message;
   ClientToServerResponse commit_response;
   // We GetUpdates for some combination of types at once.
   // requested_update_types stores the set of types which were requested.
   syncable::ModelTypeBitSet updates_request_types;
   ClientToServerResponse updates_response;
+
+  // FIXME: move these to error counters?
+  SyncOperationResult last_download_updates_result;
+  SyncOperationResult last_post_commit_result;
+  SyncOperationResult last_clear_data_result;
+
   // Used to build the shared commit message.
   DirtyOnWrite<std::vector<int64> > unsynced_handles;
   DirtyOnWrite<SyncerStatus> syncer_status;
   DirtyOnWrite<ErrorCounters> error;
   SyncCycleControlParameters control_params;
   DirtyOnWrite<int64> num_server_changes_remaining;
   OrderedCommitSet commit_set;
 };
 
 // Grouping of all state that applies to a single ModelSafeGroup.
 struct PerModelSafeGroupState {
   explicit PerModelSafeGroupState(bool* dirty_flag);
   ~PerModelSafeGroupState();
 
   UpdateProgress update_progress;
   ConflictProgress conflict_progress;
 };
 
 }  // namespace sessions
 }  // namespace browser_sync
 
 #endif  // CHROME_BROWSER_SYNC_SESSIONS_SESSION_STATE_H_