| Index: sync/sessions/session_state.h
|
| diff --git a/sync/sessions/session_state.h b/sync/sessions/session_state.h
|
| index 7403758b728e0a83a63c87ec30dec3590bb1cb7f..27872c5207dd618a9f29ce27fe5cd097888da6a8 100644
|
| --- a/sync/sessions/session_state.h
|
| +++ b/sync/sessions/session_state.h
|
| @@ -23,7 +23,6 @@
|
| #include "sync/engine/syncer_types.h"
|
| #include "sync/engine/syncproto.h"
|
| #include "sync/protocol/sync_protocol_error.h"
|
| -#include "sync/sessions/ordered_commit_set.h"
|
| #include "sync/syncable/model_type.h"
|
| #include "sync/syncable/model_type_payload_map.h"
|
| #include "sync/syncable/syncable.h"
|
| @@ -115,12 +114,10 @@ struct SyncSessionSnapshot {
|
| (&download_progress_markers)[syncable::MODEL_TYPE_COUNT],
|
| bool more_to_sync,
|
| bool is_silenced,
|
| - int64 unsynced_count,
|
| int num_encryption_conflicts,
|
| int num_hierarchy_conflicts,
|
| int num_simple_conflicts,
|
| int num_server_conflicts,
|
| - bool did_commit_items,
|
| const SyncSourceInfo& source,
|
| bool notifications_enabled,
|
| size_t num_entries,
|
| @@ -141,12 +138,10 @@ struct SyncSessionSnapshot {
|
| const std::string download_progress_markers[syncable::MODEL_TYPE_COUNT];
|
| const bool has_more_to_sync;
|
| const bool is_silenced;
|
| - const int64 unsynced_count;
|
| const int num_encryption_conflicts;
|
| const int num_hierarchy_conflicts;
|
| const int num_simple_conflicts;
|
| const int num_server_conflicts;
|
| - const bool did_commit_items;
|
| const SyncSourceInfo source;
|
| const bool notifications_enabled;
|
| const size_t num_entries;
|
| @@ -301,20 +296,15 @@ struct AllModelTypeState {
|
| 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::ModelTypeSet updates_request_types;
|
| ClientToServerResponse updates_response;
|
| // 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.
|
|
|