Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3)

Unified Diff: sync/internal_api/public/sessions/sync_session_snapshot_unittest.cc

Issue 11474036: Remove initial_sync_ended bits (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Another rebase Created 8 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 5a97a16a2043e495716d0fde0d19f534fe5117ba..9301ffd7fd596456a7b92d42bdb1eb53805c324b 100644
--- a/sync/internal_api/public/sessions/sync_session_snapshot_unittest.cc
+++ b/sync/internal_api/public/sessions/sync_session_snapshot_unittest.cc
@@ -33,12 +33,6 @@ TEST_F(SyncSessionSnapshotTest, SyncSessionSnapshotToValue) {
model_neutral.num_local_overwrites = 15;
model_neutral.num_server_overwrites = 18;
- const bool kIsShareUsable = true;
-
- const ModelTypeSet initial_sync_ended(BOOKMARKS, PREFERENCES);
- scoped_ptr<ListValue> expected_initial_sync_ended_value(
- ModelTypeSetToValue(initial_sync_ended));
-
ProgressMarkerMap download_progress_markers;
download_progress_markers[BOOKMARKS] = "test";
download_progress_markers[APPS] = "apps";
@@ -59,8 +53,6 @@ TEST_F(SyncSessionSnapshotTest, SyncSessionSnapshotToValue) {
expected_sources_list_value->Append(source.ToValue());
SyncSessionSnapshot snapshot(model_neutral,
- kIsShareUsable,
- initial_sync_ended,
download_progress_markers,
kIsSilenced,
kNumEncryptionConflicts,
@@ -74,7 +66,7 @@ TEST_F(SyncSessionSnapshotTest, SyncSessionSnapshotToValue) {
std::vector<int>(MODEL_TYPE_COUNT,0),
std::vector<int>(MODEL_TYPE_COUNT, 0));
scoped_ptr<DictionaryValue> value(snapshot.ToValue());
- EXPECT_EQ(20u, value->size());
+ EXPECT_EQ(18u, value->size());
ExpectDictIntegerValue(model_neutral.num_successful_commits,
*value, "numSuccessfulCommits");
ExpectDictIntegerValue(model_neutral.num_successful_bookmark_commits,
@@ -91,9 +83,6 @@ TEST_F(SyncSessionSnapshotTest, SyncSessionSnapshotToValue) {
*value, "numServerOverwrites");
ExpectDictIntegerValue(model_neutral.num_server_changes_remaining,
*value, "numServerChangesRemaining");
- ExpectDictBooleanValue(kIsShareUsable, *value, "isShareUsable");
- ExpectDictListValue(*expected_initial_sync_ended_value, *value,
- "initialSyncEnded");
ExpectDictDictionaryValue(*expected_download_progress_markers_value,
*value, "downloadProgressMarkers");
ExpectDictBooleanValue(kIsSilenced, *value, "isSilenced");
« no previous file with comments | « sync/internal_api/public/sessions/sync_session_snapshot.cc ('k') | sync/internal_api/public/test/test_entry_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698