| Index: chrome/browser/sync/test/engine/fake_model_worker.h
|
| diff --git a/chrome/browser/sync/test/engine/fake_model_worker.h b/chrome/browser/sync/test/engine/fake_model_worker.h
|
| index 28e340b25d42fec3dbb1ee6dacf8c7fdd202ffbc..e80a2cd25c2dea68445b265406653c499cd23c22 100644
|
| --- a/chrome/browser/sync/test/engine/fake_model_worker.h
|
| +++ b/chrome/browser/sync/test/engine/fake_model_worker.h
|
| @@ -1,4 +1,4 @@
|
| -// Copyright (c) 2011 The Chromium Authors. All rights reserved.
|
| +// Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| @@ -12,6 +12,7 @@
|
| #include "base/compiler_specific.h"
|
| #include "base/threading/non_thread_safe.h"
|
| #include "chrome/browser/sync/engine/model_safe_worker.h"
|
| +#include "chrome/browser/sync/internal_api/includes/syncer_error.h"
|
|
|
| namespace browser_sync {
|
|
|
| @@ -22,7 +23,7 @@ class FakeModelWorker : public ModelSafeWorker {
|
| explicit FakeModelWorker(ModelSafeGroup group);
|
|
|
| // ModelSafeWorker implementation.
|
| - virtual UnrecoverableErrorInfo DoWorkAndWaitUntilDone(
|
| + virtual SyncerError DoWorkAndWaitUntilDone(
|
| const WorkCallback& work) OVERRIDE;
|
| virtual ModelSafeGroup GetModelSafeGroup() OVERRIDE;
|
|
|
|
|