| Index: sync/sessions/session_state_unittest.cc
|
| diff --git a/sync/sessions/session_state_unittest.cc b/sync/sessions/session_state_unittest.cc
|
| index 011f832f96dc475d56e4fdffc6d963488382496a..7881de0d767dd1f41e929a932585f64785a9cc83 100644
|
| --- a/sync/sessions/session_state_unittest.cc
|
| +++ b/sync/sessions/session_state_unittest.cc
|
| @@ -96,12 +96,10 @@ TEST_F(SessionStateTest, SyncSessionSnapshotToValue) {
|
|
|
| const bool kHasMoreToSync = false;
|
| const bool kIsSilenced = true;
|
| - const int kUnsyncedCount = 1053;
|
| const int kNumEncryptionConflicts = 1054;
|
| const int kNumHierarchyConflicts = 1055;
|
| const int kNumSimpleConflicts = 1056;
|
| const int kNumServerConflicts = 1057;
|
| - const bool kDidCommitItems = true;
|
|
|
| SyncSourceInfo source;
|
| scoped_ptr<DictionaryValue> expected_source_value(source.ToValue());
|
| @@ -114,19 +112,17 @@ TEST_F(SessionStateTest, SyncSessionSnapshotToValue) {
|
| 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(16u, value->size());
|
| + EXPECT_EQ(14u, value->size());
|
| ExpectDictDictionaryValue(*expected_syncer_status_value, *value,
|
| "syncerStatus");
|
| ExpectDictIntegerValue(kNumServerChangesRemaining, *value,
|
| @@ -138,7 +134,6 @@ TEST_F(SessionStateTest, SyncSessionSnapshotToValue) {
|
| *value, "downloadProgressMarkers");
|
| ExpectDictBooleanValue(kHasMoreToSync, *value, "hasMoreToSync");
|
| ExpectDictBooleanValue(kIsSilenced, *value, "isSilenced");
|
| - ExpectDictIntegerValue(kUnsyncedCount, *value, "unsyncedCount");
|
| ExpectDictIntegerValue(kNumEncryptionConflicts, *value,
|
| "numEncryptionConflicts");
|
| ExpectDictIntegerValue(kNumHierarchyConflicts, *value,
|
| @@ -147,8 +142,6 @@ TEST_F(SessionStateTest, SyncSessionSnapshotToValue) {
|
| "numSimpleConflicts");
|
| ExpectDictIntegerValue(kNumServerConflicts, *value,
|
| "numServerConflicts");
|
| - ExpectDictBooleanValue(kDidCommitItems, *value,
|
| - "didCommitItems");
|
| ExpectDictDictionaryValue(*expected_source_value, *value, "source");
|
| ExpectDictBooleanValue(false, *value, "notificationsEnabled");
|
| }
|
|
|