diff options
| author | lipalani@chromium.org <lipalani@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-31 21:56:34 +0000 |
|---|---|---|
| committer | lipalani@chromium.org <lipalani@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-31 21:56:34 +0000 |
| commit | be0af86bae56ca50bbeadffc0da1848d56f30995 (patch) | |
| tree | 50cbc411a8e0279574a226c0919fa9aa7b3fc936 /chrome/browser/sync/engine/syncer_unittest.cc | |
| parent | 0a23c8f93d334d4d67cd332ced96e998cada64f6 (diff) | |
| download | chromium_src-be0af86bae56ca50bbeadffc0da1848d56f30995.zip chromium_src-be0af86bae56ca50bbeadffc0da1848d56f30995.tar.gz chromium_src-be0af86bae56ca50bbeadffc0da1848d56f30995.tar.bz2 | |
Server directed error handling backend code.
BUG=94007, 70276
TEST=sync_integration_tests.exe
Review URL: http://codereview.chromium.org/7621085
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99051 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync/engine/syncer_unittest.cc')
| -rw-r--r-- | chrome/browser/sync/engine/syncer_unittest.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/browser/sync/engine/syncer_unittest.cc b/chrome/browser/sync/engine/syncer_unittest.cc index 0d5e8c6..2810db1 100644 --- a/chrome/browser/sync/engine/syncer_unittest.cc +++ b/chrome/browser/sync/engine/syncer_unittest.cc @@ -126,6 +126,9 @@ class SyncerTest : public testing::Test, } virtual void OnShouldStopSyncingPermanently() OVERRIDE { } + virtual void OnSyncProtocolError( + const sessions::SyncSessionSnapshot& snapshot) OVERRIDE { + } // ModelSafeWorkerRegistrar implementation. virtual void GetWorkers(std::vector<ModelSafeWorker*>* out) OVERRIDE { @@ -2140,7 +2143,7 @@ TEST_F(SyncerTest, DeletingEntryInFolder) { } syncer_->SyncShare(session_.get(), SYNCER_BEGIN, SYNCER_END); StatusController* status(session_->status_controller()); - EXPECT_TRUE(0 == status->error_counters().num_conflicting_commits); + EXPECT_TRUE(0 == status->error().num_conflicting_commits); } TEST_F(SyncerTest, DeletingEntryWithLocalEdits) { |