[Sync] Convert SyncSessionSnapshot to a copy-able class.

sync/sessions/session_state.h

 // Copyright (c) 2012 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 79 matching lines @@
 
   // Any protocol errors that we received during this sync session.
   SyncProtocolError sync_protocol_error;
 
   // Records the most recent results of PostCommit and GetUpdates commands.
   SyncerError last_download_updates_result;
   SyncerError last_post_commit_result;
   SyncerError last_process_commit_response_result;
 };
 
-// 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 {
+// TODO(zea): if copying this all over the place starts getting expensive,
+// consider passing around immutable references instead of values.
+// refs.

[tim (not reviewing), 2012/04/24 01:22:08]

remove

[Nicolas Zea, 2012/04/24 18:06:51]

Done.

+// Default copy and assign welcome.
+class SyncSessionSnapshot {
+ public:
+  SyncSessionSnapshot();
   SyncSessionSnapshot(
       const SyncerStatus& syncer_status,
       const ErrorCounters& errors,
       int64 num_server_changes_remaining,
       bool is_share_usable,
       syncable::ModelTypeSet initial_sync_ended,
-      const std::string
-          (&download_progress_markers)[syncable::MODEL_TYPE_COUNT],
+      const syncable::ModelTypePayloadMap& download_progress_markers,
       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,
       base::Time sync_start_time,
       bool retry_scheduled);
   ~SyncSessionSnapshot();
 
   // Caller takes ownership of the returned dictionary.
   base::DictionaryValue* ToValue() const;
 
   std::string ToString() const;
 
-  const SyncerStatus syncer_status;
-  const ErrorCounters errors;
-  const int64 num_server_changes_remaining;
-  const bool is_share_usable;
-  const syncable::ModelTypeSet initial_sync_ended;
-  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;
-  base::Time sync_start_time;
-  const bool retry_scheduled;
+  SyncerStatus syncer_status() const;
+  ErrorCounters errors() const;
+  int64 num_server_changes_remaining() const;
+  bool is_share_usable() const;
+  syncable::ModelTypeSet initial_sync_ended() const;
+  syncable::ModelTypePayloadMap download_progress_markers() 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() const;
+  base::Time sync_start_time() const;
+  bool retry_scheduled() const;
+
+ private:
+  SyncerStatus syncer_status_;
+  ErrorCounters errors_;
+  int64 num_server_changes_remaining_;
+  bool is_share_usable_;
+  syncable::ModelTypeSet initial_sync_ended_;
+  syncable::ModelTypePayloadMap download_progress_markers_;
+  bool has_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_;
+  SyncSourceInfo source_;
+  bool notifications_enabled_;
+  size_t num_entries_;
+  base::Time sync_start_time_;
+  bool retry_scheduled_;
 };
 
 // Tracks progress of conflicts and their resolutions.
 class ConflictProgress {
  public:
   explicit ConflictProgress(bool* dirty_flag);
   ~ConflictProgress();
 
   bool HasSimpleConflictItem(const syncable::Id &id) const;
 
@@ skipping 158 matching lines @@
   ~PerModelSafeGroupState();
 
   UpdateProgress update_progress;
   ConflictProgress conflict_progress;
 };
 
 }  // namespace sessions
 }  // namespace browser_sync
 
 #endif  // SYNC_SESSIONS_SESSION_STATE_H_