sync: Count and report reflected updates

sync/sessions/session_state.cc

 // 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.
 
 #include "sync/sessions/session_state.h"
 
 #include <map>
 #include <set>
 #include <string>
 #include <utility>
@@ skipping 32 matching lines @@
   value->Set("types", syncable::ModelTypePayloadMapToValue(types));
   return value;
 }
 
 SyncerStatus::SyncerStatus()
     : invalid_store(false),
       num_successful_commits(0),
       num_successful_bookmark_commits(0),
       num_updates_downloaded_total(0),
       num_tombstone_updates_downloaded_total(0),
+      num_reflected_updates_downloaded_total(0),
       num_local_overwrites(0),
       num_server_overwrites(0) {
 }
 
 SyncerStatus::~SyncerStatus() {
 }
 
 DictionaryValue* SyncerStatus::ToValue() const {
   DictionaryValue* value = new DictionaryValue();
   value->SetBoolean("invalidStore", invalid_store);
   value->SetInteger("numSuccessfulCommits", num_successful_commits);
   value->SetInteger("numSuccessfulBookmarkCommits",
                 num_successful_bookmark_commits);
   value->SetInteger("numUpdatesDownloadedTotal",
                 num_updates_downloaded_total);
   value->SetInteger("numTombstoneUpdatesDownloadedTotal",
                 num_tombstone_updates_downloaded_total);
+  value->SetInteger("numReflectedUpdatesDownloadedTotal",
+                num_reflected_updates_downloaded_total);
   value->SetInteger("numLocalOverwrites", num_local_overwrites);
   value->SetInteger("numServerOverwrites", num_server_overwrites);
   return value;
 }
 
 DictionaryValue* DownloadProgressMarkersToValue(
     const std::string
         (&download_progress_markers)[syncable::MODEL_TYPE_COUNT]) {
   DictionaryValue* value = new DictionaryValue();
   for (int i = syncable::FIRST_REAL_MODEL_TYPE;
@@ skipping 26 matching lines @@
         (&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,
     base::Time sync_start_time,
     bool retry_scheduled)
     : syncer_status(syncer_status),
       errors(errors),
       num_server_changes_remaining(num_server_changes_remaining),
       is_share_usable(is_share_usable),
       initial_sync_ended(initial_sync_ended),
       download_progress_markers(),
       has_more_to_sync(more_to_sync),
       is_silenced(is_silenced),
       unsynced_count(unsynced_count),
       num_encryption_conflicts(num_encryption_conflicts),
       num_hierarchy_conflicts(num_hierarchy_conflicts),
       num_simple_conflicts(num_simple_conflicts),
       num_server_conflicts(num_server_conflicts),
       did_commit_items(did_commit_items),
       source(source),
+      notifications_enabled(notifications_enabled),
       num_entries(num_entries),
       sync_start_time(sync_start_time),
       retry_scheduled(retry_scheduled) {
   for (int i = syncable::FIRST_REAL_MODEL_TYPE;
        i < syncable::MODEL_TYPE_COUNT; ++i) {
     const_cast<std::string&>(this->download_progress_markers[i]).assign(
         download_progress_markers[i]);
   }
 }
 
@@ skipping 19 matching lines @@
                     num_encryption_conflicts);
   value->SetInteger("numHierarchyConflicts",
                     num_hierarchy_conflicts);
   value->SetInteger("numSimpleConflicts",
                     num_simple_conflicts);
   value->SetInteger("numServerConflicts",
                     num_server_conflicts);
   value->SetBoolean("didCommitItems", did_commit_items);
   value->SetInteger("numEntries", num_entries);
   value->Set("source", source.ToValue());
+  value->SetBoolean("notificationsEnabled", notifications_enabled);
   return value;
 }
 
 std::string SyncSessionSnapshot::ToString() const {
   scoped_ptr<DictionaryValue> value(ToValue());
   std::string json;
   base::JSONWriter::WriteWithOptions(value.get(),
                                      base::JSONWriter::OPTIONS_PRETTY_PRINT,
                                      &json);
   return json;
@@ skipping 134 matching lines @@
 
 PerModelSafeGroupState::PerModelSafeGroupState(bool* dirty_flag)
     : conflict_progress(dirty_flag) {
 }
 
 PerModelSafeGroupState::~PerModelSafeGroupState() {
 }
 
 }  // namespace sessions
 }  // namespace browser_sync