Index: sync/internal_api/public/sessions/sync_session_snapshot_unittest.cc |
diff --git a/sync/internal_api/public/sessions/sync_session_snapshot_unittest.cc b/sync/internal_api/public/sessions/sync_session_snapshot_unittest.cc |
index df33a41bd5b543404073d5711274a5f6a77d3533..4214c7917a1e152e374ba58084f2e022d98797a6 100644 |
--- a/sync/internal_api/public/sessions/sync_session_snapshot_unittest.cc |
+++ b/sync/internal_api/public/sessions/sync_session_snapshot_unittest.cc |
@@ -53,6 +53,11 @@ TEST_F(SyncSessionSnapshotTest, SyncSessionSnapshotToValue) { |
SyncSourceInfo source; |
scoped_ptr<DictionaryValue> expected_source_value(source.ToValue()); |
+ std::vector<SyncSourceInfo> merged_sources_log; |
+ merged_sources_log.push_back(source); |
+ scoped_ptr<ListValue> expected_merged_sources_value(new ListValue()); |
+ expected_merged_sources_value->Append(source.ToValue()); |
+ |
SyncSessionSnapshot snapshot(model_neutral, |
kIsShareUsable, |
initial_sync_ended, |
@@ -62,13 +67,14 @@ TEST_F(SyncSessionSnapshotTest, SyncSessionSnapshotToValue) { |
kNumHierarchyConflicts, |
kNumServerConflicts, |
source, |
+ merged_sources_log, |
false, |
0, |
base::Time::Now(), |
std::vector<int>(MODEL_TYPE_COUNT,0), |
std::vector<int>(MODEL_TYPE_COUNT, 0)); |
scoped_ptr<DictionaryValue> value(snapshot.ToValue()); |
- EXPECT_EQ(19u, value->size()); |
+ EXPECT_EQ(20u, value->size()); |
ExpectDictIntegerValue(model_neutral.num_successful_commits, |
*value, "numSuccessfulCommits"); |
ExpectDictIntegerValue(model_neutral.num_successful_bookmark_commits, |
@@ -98,6 +104,7 @@ TEST_F(SyncSessionSnapshotTest, SyncSessionSnapshotToValue) { |
ExpectDictIntegerValue(kNumServerConflicts, *value, |
"numServerConflicts"); |
ExpectDictDictionaryValue(*expected_source_value, *value, "source"); |
+ ExpectDictListValue(*expected_merged_sources_value, *value, "sourcesList"); |
ExpectDictBooleanValue(false, *value, "notificationsEnabled"); |
} |