| Index: chrome/browser/sync/glue/history_model_worker.h
|
| diff --git a/chrome/browser/sync/glue/history_model_worker.h b/chrome/browser/sync/glue/history_model_worker.h
|
| index 108038a5098c9f8272aa50631321db77739139c3..9dc81b53ede95a783e740d2061686d28e23b19bc 100644
|
| --- a/chrome/browser/sync/glue/history_model_worker.h
|
| +++ b/chrome/browser/sync/glue/history_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.
|
|
|
| @@ -7,7 +7,6 @@
|
| #pragma once
|
|
|
| #include "chrome/browser/sync/engine/model_safe_worker.h"
|
| -#include "chrome/browser/sync/util/unrecoverable_error_info.h"
|
|
|
| #include "base/basictypes.h"
|
| #include "base/callback_forward.h"
|
| @@ -27,7 +26,7 @@ class HistoryModelWorker : public browser_sync::ModelSafeWorker {
|
| virtual ~HistoryModelWorker();
|
|
|
| // ModelSafeWorker implementation. Called on syncapi SyncerThread.
|
| - virtual UnrecoverableErrorInfo DoWorkAndWaitUntilDone(
|
| + virtual SyncerError DoWorkAndWaitUntilDone(
|
| const WorkCallback& work) OVERRIDE;
|
| virtual ModelSafeGroup GetModelSafeGroup() OVERRIDE;
|
|
|
|
|