| Index: chrome/browser/sync/engine/syncer_unittest.cc
|
| diff --git a/chrome/browser/sync/engine/syncer_unittest.cc b/chrome/browser/sync/engine/syncer_unittest.cc
|
| index 0d5e8c6eeec9d251348f322293caa17b764e1d2a..2810db148d6257fe06721a44bbf25673e68c0b5d 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) {
|
|
|