sync: Remove SyncSourceInfo

sync/internal_api/public/sessions/sync_session_snapshot.h

Index: sync/internal_api/public/sessions/sync_session_snapshot.h
diff --git a/sync/internal_api/public/sessions/sync_session_snapshot.h b/sync/internal_api/public/sessions/sync_session_snapshot.h
index e1053ad47adcd24e3d6227829a7476a8a0fc73ea..267566894796b76fcc8566bc620c65ab1bb06b5d 100644
--- a/sync/internal_api/public/sessions/sync_session_snapshot.h
+++ b/sync/internal_api/public/sessions/sync_session_snapshot.h
@@ -13,7 +13,6 @@
 #include "sync/internal_api/public/base/model_type.h"
 #include "sync/internal_api/public/base/progress_marker_map.h"
 #include "sync/internal_api/public/sessions/model_neutral_state.h"
-#include "sync/internal_api/public/sessions/sync_source_info.h"
 
 namespace base {
 class DictionaryValue;
@@ -37,7 +36,19 @@ class SYNC_EXPORT SyncSessionSnapshot {
       int num_encryption_conflicts,
       int num_hierarchy_conflicts,
       int num_server_conflicts,
-      const SyncSourceInfo& source,
+      bool notifications_enabled,
+      size_t num_entries,
+      base::Time sync_start_time,
+      const std::vector<int>& num_entries_by_type,
+      const std::vector<int>& num_to_delete_entries_by_type,
+      sync_pb::GetUpdatesCallerInfo::GetUpdatesSource legacy_updates_source);
+  SyncSessionSnapshot(

[tim (not reviewing), 2013/08/01 17:16:38]

Style guide forbids overloading functions (constructors included).  You should
make one of these a factory function (or both with a single private ctor).

[rlarocque, 2013/08/01 21:01:41]

Apparently the second constructor is only used in tests.  I removed the second
constructor and updated the two invocations of it to use the first.

+      const ModelNeutralState& model_neutral_state,
+      const ProgressMarkerMap& download_progress_markers,
+      bool is_silenced,
+      int num_encryption_conflicts,
+      int num_hierarchy_conflicts,
+      int num_server_conflicts,
       bool notifications_enabled,
       size_t num_entries,
       base::Time sync_start_time,
@@ -59,12 +70,12 @@ class SYNC_EXPORT SyncSessionSnapshot {
   int num_encryption_conflicts() const;
   int num_hierarchy_conflicts() const;
   int num_server_conflicts() const;
-  SyncSourceInfo source() const;
   bool notifications_enabled() const;
   size_t num_entries() const;
   base::Time sync_start_time() const;
   const std::vector<int>& num_entries_by_type() const;
   const std::vector<int>& num_to_delete_entries_by_type() const;
+  sync_pb::GetUpdatesCallerInfo::GetUpdatesSource legacy_updates_source() const;

[tim (not reviewing), 2013/08/01 17:16:38]

Comment what this is / why it is considered "legacy".

[rlarocque, 2013/08/01 21:01:41]

Done.

 
   // Set iff this snapshot was not built using the default constructor.
   bool is_initialized() const;
@@ -76,7 +87,6 @@ class SYNC_EXPORT SyncSessionSnapshot {
   int num_encryption_conflicts_;
   int num_hierarchy_conflicts_;
   int num_server_conflicts_;
-  SyncSourceInfo source_;
   bool notifications_enabled_;
   size_t num_entries_;
   base::Time sync_start_time_;
@@ -84,6 +94,8 @@ class SYNC_EXPORT SyncSessionSnapshot {
   std::vector<int> num_entries_by_type_;
   std::vector<int> num_to_delete_entries_by_type_;
 
+  sync_pb::GetUpdatesCallerInfo::GetUpdatesSource legacy_updates_source_;
+
   bool is_initialized_;
 };