| Index: chrome/browser/sync/test/engine/fake_model_worker.cc
|
| diff --git a/chrome/browser/sync/test/engine/fake_model_worker.cc b/chrome/browser/sync/test/engine/fake_model_worker.cc
|
| index 059935093b7f9a03f3d4c3877f7aa3a0f47ce607..5b3dc60179a4f9ddc2887c219550f50ba99110d3 100644
|
| --- a/chrome/browser/sync/test/engine/fake_model_worker.cc
|
| +++ b/chrome/browser/sync/test/engine/fake_model_worker.cc
|
| @@ -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.
|
|
|
| @@ -16,7 +16,7 @@ FakeModelWorker::~FakeModelWorker() {
|
| DCHECK(non_thread_safe_.CalledOnValidThread());
|
| }
|
|
|
| -UnrecoverableErrorInfo FakeModelWorker::DoWorkAndWaitUntilDone(
|
| +SyncerError FakeModelWorker::DoWorkAndWaitUntilDone(
|
| const WorkCallback& work) {
|
| DCHECK(non_thread_safe_.CalledOnValidThread());
|
| // Simply do the work on the current thread.
|
|
|