sync: Count and report reflected updates

sync/sessions/session_state_unittest.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 <string>
 
 #include "base/base64.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 31 matching lines @@
   ExpectDictDictionaryValue(*expected_types_value, *value, "types");
 }
 
 TEST_F(SessionStateTest, SyncerStatusToValue) {
   SyncerStatus status;
   status.invalid_store = true;
   status.num_successful_commits = 5;
   status.num_successful_bookmark_commits = 10;
   status.num_updates_downloaded_total = 100;
   status.num_tombstone_updates_downloaded_total = 200;
+  status.num_reflected_updates_downloaded_total = 50;
   status.num_local_overwrites = 15;
   status.num_server_overwrites = 18;
 
   scoped_ptr<DictionaryValue> value(status.ToValue());
-  EXPECT_EQ(7u, value->size());
+  EXPECT_EQ(8u, value->size());
   ExpectDictBooleanValue(status.invalid_store, *value, "invalidStore");
   ExpectDictIntegerValue(status.num_successful_commits,
                          *value, "numSuccessfulCommits");
   ExpectDictIntegerValue(status.num_successful_bookmark_commits,
                          *value, "numSuccessfulBookmarkCommits");
   ExpectDictIntegerValue(status.num_updates_downloaded_total,
                          *value, "numUpdatesDownloadedTotal");
   ExpectDictIntegerValue(status.num_tombstone_updates_downloaded_total,
                          *value, "numTombstoneUpdatesDownloadedTotal");
+  ExpectDictIntegerValue(status.num_reflected_updates_downloaded_total,
+                         *value, "numReflectedUpdatesDownloadedTotal");
   ExpectDictIntegerValue(status.num_local_overwrites,
                          *value, "numLocalOverwrites");
   ExpectDictIntegerValue(status.num_server_overwrites,
                          *value, "numServerOverwrites");
 }
 
 TEST_F(SessionStateTest, DownloadProgressMarkersToValue) {
   std::string download_progress_markers[syncable::MODEL_TYPE_COUNT];
   for (int i = syncable::FIRST_REAL_MODEL_TYPE;
        i < syncable::MODEL_TYPE_COUNT; ++i) {
@@ skipping 58 matching lines @@
                                download_progress_markers,
                                kHasMoreToSync,
                                kIsSilenced,
                                kUnsyncedCount,
                                kNumEncryptionConflicts,
                                kNumHierarchyConflicts,
                                kNumSimpleConflicts,
                                kNumServerConflicts,
                                kDidCommitItems,
                                source,
+                               false,
                                0,
                                base::Time::Now(),
                                false);
   scoped_ptr<DictionaryValue> value(snapshot.ToValue());
-  EXPECT_EQ(15u, value->size());
+  EXPECT_EQ(16u, value->size());
   ExpectDictDictionaryValue(*expected_syncer_status_value, *value,
                             "syncerStatus");
   ExpectDictIntegerValue(kNumServerChangesRemaining, *value,
                          "numServerChangesRemaining");
   ExpectDictBooleanValue(kIsShareUsable, *value, "isShareUsable");
   ExpectDictListValue(*expected_initial_sync_ended_value, *value,
                       "initialSyncEnded");
   ExpectDictDictionaryValue(*expected_download_progress_markers_value,
                             *value, "downloadProgressMarkers");
   ExpectDictBooleanValue(kHasMoreToSync, *value, "hasMoreToSync");
   ExpectDictBooleanValue(kIsSilenced, *value, "isSilenced");
   ExpectDictIntegerValue(kUnsyncedCount, *value, "unsyncedCount");
   ExpectDictIntegerValue(kNumEncryptionConflicts, *value,
                          "numEncryptionConflicts");
   ExpectDictIntegerValue(kNumHierarchyConflicts, *value,
                          "numHierarchyConflicts");
   ExpectDictIntegerValue(kNumSimpleConflicts, *value,
                          "numSimpleConflicts");
   ExpectDictIntegerValue(kNumServerConflicts, *value,
                          "numServerConflicts");
   ExpectDictBooleanValue(kDidCommitItems, *value,
                          "didCommitItems");
   ExpectDictDictionaryValue(*expected_source_value, *value, "source");
+  ExpectDictBooleanValue(false, *value, "notificationsEnabled");
 }
 
 }  // namespace
 }  // namespace sessions
 }  // namespace browser_sync