diff options
| author | chron@chromium.org <chron@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-23 19:48:23 +0000 |
|---|---|---|
| committer | chron@chromium.org <chron@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-23 19:48:23 +0000 |
| commit | b29384229fb1c54ec42a8f0ad3a25e9995d2709f (patch) | |
| tree | b1caa3ee8e5547255e1ea22a597d14ca14924d04 /chrome/test/sync | |
| parent | 603994f208a93a4777c0a0f47c1225d1b227b793 (diff) | |
| download | chromium_src-b29384229fb1c54ec42a8f0ad3a25e9995d2709f.zip chromium_src-b29384229fb1c54ec42a8f0ad3a25e9995d2709f.tar.gz chromium_src-b29384229fb1c54ec42a8f0ad3a25e9995d2709f.tar.bz2 | |
Hook up "remaining changes" to sync client. Remove "latest timestamp".
TEST=manually tested
BUG=19993
Review URL: http://codereview.chromium.org/295052
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29930 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/sync')
| -rw-r--r-- | chrome/test/sync/engine/mock_server_connection.cc | 7 | ||||
| -rw-r--r-- | chrome/test/sync/engine/mock_server_connection.h | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/chrome/test/sync/engine/mock_server_connection.cc b/chrome/test/sync/engine/mock_server_connection.cc index b2af891..e4fd70a 100644 --- a/chrome/test/sync/engine/mock_server_connection.cc +++ b/chrome/test/sync/engine/mock_server_connection.cc @@ -208,8 +208,7 @@ SyncEntity* MockConnectionManager::AddUpdateFull(string id, string parent_id, ent->set_ctime(1); ent->set_position_in_parent(GeneratePositionInParent()); AddDefaultBookmarkData(ent, is_dir); - if (sync_ts > updates_.newest_timestamp()) - updates_.set_newest_timestamp(sync_ts); + return ent; } @@ -251,8 +250,8 @@ void MockConnectionManager::SetNewTimestamp(int64 ts) { updates_.set_new_timestamp(ts); } -void MockConnectionManager::SetNewestTimestamp(int64 ts) { - updates_.set_newest_timestamp(ts); +void MockConnectionManager::SetChangesRemaining(int64 timestamp) { + updates_.set_changes_remaining(timestamp); } void MockConnectionManager::ProcessGetUpdates(ClientToServerMessage* csm, diff --git a/chrome/test/sync/engine/mock_server_connection.h b/chrome/test/sync/engine/mock_server_connection.h index e203081..afc28d9 100644 --- a/chrome/test/sync/engine/mock_server_connection.h +++ b/chrome/test/sync/engine/mock_server_connection.h @@ -107,7 +107,7 @@ class MockConnectionManager : public browser_sync::ServerConnectionManager { const string& entry_id); void SetLastUpdatePosition(int64 position_in_parent); void SetNewTimestamp(int64 ts); - void SetNewestTimestamp(int64 ts); + void SetChangesRemaining(int64 timestamp); // For AUTHENTICATE responses. void SetAuthenticationResponseInfo(const std::string& valid_auth_token, |