Server directed error handling backend code.

chrome/browser/sync/sessions/session_state.h

Index: chrome/browser/sync/sessions/session_state.h
diff --git a/chrome/browser/sync/sessions/session_state.h b/chrome/browser/sync/sessions/session_state.h
index 2abd559cb511b3da44249ddb5a71936f684c422b..0b3d99a57fa5dfda53ac0a85631c79c423fe64dd 100644
--- a/chrome/browser/sync/sessions/session_state.h
+++ b/chrome/browser/sync/sessions/session_state.h
@@ -22,6 +22,7 @@
 #include "base/basictypes.h"
 #include "chrome/browser/sync/engine/syncer_types.h"
 #include "chrome/browser/sync/engine/syncproto.h"
+#include "chrome/browser/sync/engine/sync_error.h"
 #include "chrome/browser/sync/sessions/ordered_commit_set.h"
 #include "chrome/browser/sync/syncable/model_type.h"
 #include "chrome/browser/sync/syncable/model_type_payload_map.h"
@@ -131,7 +132,8 @@ struct SyncSessionSnapshot {
       bool did_commit_items,
       const SyncSourceInfo& source,
       size_t num_entries,
-      base::Time sync_start_time);
+      base::Time sync_start_time,
+      sync_api::SyncError sync_error);
   ~SyncSessionSnapshot();
 
   // Caller takes ownership of the returned dictionary.
@@ -154,6 +156,7 @@ struct SyncSessionSnapshot {
   const SyncSourceInfo source;
   const size_t num_entries;
   base::Time sync_start_time;
+  sync_api::SyncError sync_error;
 };
 
 // Tracks progress of conflicts and their resolution using conflict sets.
@@ -323,6 +326,7 @@ struct AllModelTypeState {
   DirtyOnWrite<ErrorCounters> error_counters;
   SyncCycleControlParameters control_params;
   DirtyOnWrite<int64> num_server_changes_remaining;
+  DirtyOnWrite<sync_api::SyncError> sync_error;
   OrderedCommitSet commit_set;
 };