| Index: chrome/browser/sync/engine/model_safe_worker.h
|
| diff --git a/chrome/browser/sync/engine/model_safe_worker.h b/chrome/browser/sync/engine/model_safe_worker.h
|
| index 3a707db4a2749ff358343a17ea58042048a7314e..aa065fca79eb781fd9cd6c577b01056acb8cc6fc 100644
|
| --- a/chrome/browser/sync/engine/model_safe_worker.h
|
| +++ b/chrome/browser/sync/engine/model_safe_worker.h
|
| @@ -50,21 +50,19 @@ std::string ModelSafeGroupToString(ModelSafeGroup group);
|
| // syncable::Directory due to a race.
|
| class ModelSafeWorker : public base::RefCountedThreadSafe<ModelSafeWorker> {
|
| public:
|
| - ModelSafeWorker();
|
| - virtual ~ModelSafeWorker();
|
| -
|
| // Any time the Syncer performs model modifications (e.g employing a
|
| // WriteTransaction), it should be done by this method to ensure it is done
|
| // from a model-safe thread.
|
| virtual UnrecoverableErrorInfo DoWorkAndWaitUntilDone(
|
| - const WorkCallback& work);
|
| + const WorkCallback& work) = 0;
|
| +
|
| + virtual ModelSafeGroup GetModelSafeGroup() = 0;
|
|
|
| - virtual ModelSafeGroup GetModelSafeGroup();
|
| + protected:
|
| + virtual ~ModelSafeWorker();
|
|
|
| private:
|
| friend class base::RefCountedThreadSafe<ModelSafeWorker>;
|
| -
|
| - DISALLOW_COPY_AND_ASSIGN(ModelSafeWorker);
|
| };
|
|
|
| // A map that details which ModelSafeGroup each syncable::ModelType
|
|
|