| Index: components/sync/engine/model_safe_worker.h
|
| diff --git a/sync/internal_api/public/engine/model_safe_worker.h b/components/sync/engine/model_safe_worker.h
|
| similarity index 91%
|
| rename from sync/internal_api/public/engine/model_safe_worker.h
|
| rename to components/sync/engine/model_safe_worker.h
|
| index 87662db834d7dcd909e9bf23e1bcf987e47c3ffd..df296303645b3ecf93c6c76d7a9be3595683e2b7 100644
|
| --- a/sync/internal_api/public/engine/model_safe_worker.h
|
| +++ b/components/sync/engine/model_safe_worker.h
|
| @@ -2,8 +2,8 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef SYNC_INTERNAL_API_PUBLIC_ENGINE_MODEL_SAFE_WORKER_H_
|
| -#define SYNC_INTERNAL_API_PUBLIC_ENGINE_MODEL_SAFE_WORKER_H_
|
| +#ifndef COMPONENTS_SYNC_ENGINE_MODEL_SAFE_WORKER_H_
|
| +#define COMPONENTS_SYNC_ENGINE_MODEL_SAFE_WORKER_H_
|
|
|
| #include <map>
|
| #include <memory>
|
| @@ -16,9 +16,9 @@
|
| #include "base/single_thread_task_runner.h"
|
| #include "base/synchronization/lock.h"
|
| #include "base/synchronization/waitable_event.h"
|
| -#include "sync/base/sync_export.h"
|
| -#include "sync/internal_api/public/base/model_type.h"
|
| -#include "sync/internal_api/public/util/syncer_error.h"
|
| +#include "components/sync/base/model_type.h"
|
| +#include "components/sync/base/sync_export.h"
|
| +#include "components/sync/base/syncer_error.h"
|
|
|
| namespace base {
|
| class DictionaryValue;
|
| @@ -105,9 +105,7 @@ class SYNC_EXPORT ModelSafeWorker
|
| // from a model-safe thread.
|
| virtual SyncerError DoWorkAndWaitUntilDoneImpl(const WorkCallback& work) = 0;
|
|
|
| - base::WaitableEvent* work_done_or_stopped() {
|
| - return &work_done_or_stopped_;
|
| - }
|
| + base::WaitableEvent* work_done_or_stopped() { return &work_done_or_stopped_; }
|
|
|
| // Return true if the worker was stopped. Thread safe.
|
| bool IsStopped();
|
| @@ -159,13 +157,12 @@ SYNC_EXPORT std::unique_ptr<base::DictionaryValue> ModelSafeRoutingInfoToValue(
|
| SYNC_EXPORT std::string ModelSafeRoutingInfoToString(
|
| const ModelSafeRoutingInfo& routing_info);
|
|
|
| -SYNC_EXPORT ModelTypeSet GetRoutingInfoTypes(
|
| - const ModelSafeRoutingInfo& routing_info);
|
| +SYNC_EXPORT ModelTypeSet
|
| +GetRoutingInfoTypes(const ModelSafeRoutingInfo& routing_info);
|
|
|
| -SYNC_EXPORT ModelSafeGroup GetGroupForModelType(
|
| - const ModelType type,
|
| - const ModelSafeRoutingInfo& routes);
|
| +SYNC_EXPORT ModelSafeGroup
|
| +GetGroupForModelType(const ModelType type, const ModelSafeRoutingInfo& routes);
|
|
|
| } // namespace syncer
|
|
|
| -#endif // SYNC_INTERNAL_API_PUBLIC_ENGINE_MODEL_SAFE_WORKER_H_
|
| +#endif // COMPONENTS_SYNC_ENGINE_MODEL_SAFE_WORKER_H_
|
|
|