| Index: components/sync/driver/glue/browser_thread_model_worker.h
|
| diff --git a/components/sync/driver/glue/browser_thread_model_worker.h b/components/sync/driver/glue/browser_thread_model_worker.h
|
| index 77b22ce648fb8cae777f7c1d188aad0983cf319a..6434efe9b14b071629f74956676f44904b0aaae3 100644
|
| --- a/components/sync/driver/glue/browser_thread_model_worker.h
|
| +++ b/components/sync/driver/glue/browser_thread_model_worker.h
|
| @@ -14,44 +14,45 @@
|
| namespace base {
|
| class SingleThreadTaskRunner;
|
| class WaitableEvent;
|
| -} // namespace base
|
| +}
|
|
|
| -namespace syncer {
|
| +namespace browser_sync {
|
|
|
| -// A ModelSafeWorker for models that accept requests from the
|
| +// A syncer::ModelSafeWorker for models that accept requests from the
|
| // syncapi that need to be fulfilled on a browser thread, for example
|
| // autofill on the DB thread.
|
| // TODO(sync): Try to generalize other ModelWorkers (e.g. history, etc).
|
| -class BrowserThreadModelWorker : public ModelSafeWorker {
|
| +class BrowserThreadModelWorker : public syncer::ModelSafeWorker {
|
| public:
|
| BrowserThreadModelWorker(
|
| const scoped_refptr<base::SingleThreadTaskRunner>& runner,
|
| - ModelSafeGroup group,
|
| - WorkerLoopDestructionObserver* observer);
|
| + syncer::ModelSafeGroup group,
|
| + syncer::WorkerLoopDestructionObserver* observer);
|
|
|
| - // ModelSafeWorker implementation. Called on the sync thread.
|
| + // syncer::ModelSafeWorker implementation. Called on the sync thread.
|
| void RegisterForLoopDestruction() override;
|
| - ModelSafeGroup GetModelSafeGroup() override;
|
| + syncer::ModelSafeGroup GetModelSafeGroup() override;
|
|
|
| protected:
|
| ~BrowserThreadModelWorker() override;
|
|
|
| - SyncerError DoWorkAndWaitUntilDoneImpl(const WorkCallback& work) override;
|
| + syncer::SyncerError DoWorkAndWaitUntilDoneImpl(
|
| + const syncer::WorkCallback& work) override;
|
|
|
| // Marked pure virtual so subclasses have to override, but there is
|
| // an implementation that subclasses should use. This is so that
|
| // (subclass)::CallDoWorkAndSignalTask shows up in callstacks.
|
| - virtual void CallDoWorkAndSignalTask(const WorkCallback& work,
|
| + virtual void CallDoWorkAndSignalTask(const syncer::WorkCallback& work,
|
| base::WaitableEvent* done,
|
| - SyncerError* error);
|
| + syncer::SyncerError* error);
|
|
|
| private:
|
| scoped_refptr<base::SingleThreadTaskRunner> runner_;
|
| - ModelSafeGroup group_;
|
| + syncer::ModelSafeGroup group_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(BrowserThreadModelWorker);
|
| };
|
|
|
| -} // namespace syncer
|
| +} // namespace browser_sync
|
|
|
| #endif // COMPONENTS_SYNC_DRIVER_GLUE_BROWSER_THREAD_MODEL_WORKER_H_
|
|
|