| Index: components/sync/sessions_impl/model_type_registry.h
|
| diff --git a/sync/sessions/model_type_registry.h b/components/sync/sessions_impl/model_type_registry.h
|
| similarity index 88%
|
| rename from sync/sessions/model_type_registry.h
|
| rename to components/sync/sessions_impl/model_type_registry.h
|
| index 099a4e1ee83465d6215149affa93705122cc6cd5..01f2f260abc9257bc8ab4a68685ca9f6d77537aa 100644
|
| --- a/sync/sessions/model_type_registry.h
|
| +++ b/components/sync/sessions_impl/model_type_registry.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_SESSIONS_MODEL_TYPE_REGISTRY_H_
|
| -#define SYNC_SESSIONS_MODEL_TYPE_REGISTRY_H_
|
| +#ifndef COMPONENTS_SYNC_SESSIONS_IMPL_MODEL_TYPE_REGISTRY_H_
|
| +#define COMPONENTS_SYNC_SESSIONS_IMPL_MODEL_TYPE_REGISTRY_H_
|
|
|
| #include <map>
|
| #include <memory>
|
| @@ -13,14 +13,14 @@
|
| #include "base/macros.h"
|
| #include "base/memory/scoped_vector.h"
|
| #include "base/memory/weak_ptr.h"
|
| -#include "sync/base/sync_export.h"
|
| -#include "sync/engine/nudge_handler.h"
|
| -#include "sync/internal_api/public/base/model_type.h"
|
| -#include "sync/internal_api/public/engine/model_safe_worker.h"
|
| -#include "sync/internal_api/public/model_type_connector.h"
|
| -#include "sync/internal_api/public/non_blocking_sync_common.h"
|
| -#include "sync/internal_api/public/sessions/type_debug_info_observer.h"
|
| -#include "sync/internal_api/public/sync_encryption_handler.h"
|
| +#include "components/sync/base/model_type.h"
|
| +#include "components/sync/base/sync_export.h"
|
| +#include "components/sync/core/model_type_connector.h"
|
| +#include "components/sync/core/non_blocking_sync_common.h"
|
| +#include "components/sync/core/sync_encryption_handler.h"
|
| +#include "components/sync/engine/model_safe_worker.h"
|
| +#include "components/sync/engine_impl/nudge_handler.h"
|
| +#include "components/sync/sessions/type_debug_info_observer.h"
|
|
|
| namespace syncer_v2 {
|
| struct DataTypeState;
|
| @@ -50,7 +50,7 @@ class SYNC_EXPORT ModelTypeRegistry : public syncer_v2::ModelTypeConnector,
|
| public SyncEncryptionHandler::Observer {
|
| public:
|
| // Constructs a ModelTypeRegistry that supports directory types.
|
| - ModelTypeRegistry(const std::vector<scoped_refptr<ModelSafeWorker> >& workers,
|
| + ModelTypeRegistry(const std::vector<scoped_refptr<ModelSafeWorker>>& workers,
|
| syncable::Directory* directory,
|
| NudgeHandler* nudge_handler);
|
| ~ModelTypeRegistry() override;
|
| @@ -135,7 +135,7 @@ class SYNC_EXPORT ModelTypeRegistry : public syncer_v2::ModelTypeConnector,
|
| DirectoryTypeDebugInfoEmitterMap directory_type_debug_info_emitter_map_;
|
|
|
| // The known ModelSafeWorkers.
|
| - std::map<ModelSafeGroup, scoped_refptr<ModelSafeWorker> > workers_map_;
|
| + std::map<ModelSafeGroup, scoped_refptr<ModelSafeWorker>> workers_map_;
|
|
|
| // The directory. Not owned.
|
| syncable::Directory* directory_;
|
| @@ -167,4 +167,4 @@ class SYNC_EXPORT ModelTypeRegistry : public syncer_v2::ModelTypeConnector,
|
|
|
| } // namespace syncer
|
|
|
| -#endif // SYNC_SESSIONS_MODEL_TYPE_REGISTRY_H_
|
| +#endif // COMPONENTS_SYNC_SESSIONS_IMPL_MODEL_TYPE_REGISTRY_H_
|
|
|