| Index: components/sync/engine_impl/syncer_proto_util.h
|
| diff --git a/sync/engine/syncer_proto_util.h b/components/sync/engine_impl/syncer_proto_util.h
|
| similarity index 92%
|
| rename from sync/engine/syncer_proto_util.h
|
| rename to components/sync/engine_impl/syncer_proto_util.h
|
| index 3fbc8214738f01d1d7718fbdf7cc4dc72fd07efe..9f71b62cf03d96e1b90fc5ec32c4c98463090ab6 100644
|
| --- a/sync/engine/syncer_proto_util.h
|
| +++ b/components/sync/engine_impl/syncer_proto_util.h
|
| @@ -2,18 +2,18 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef SYNC_ENGINE_SYNCER_PROTO_UTIL_H_
|
| -#define SYNC_ENGINE_SYNCER_PROTO_UTIL_H_
|
| +#ifndef COMPONENTS_SYNC_ENGINE_IMPL_SYNCER_PROTO_UTIL_H_
|
| +#define COMPONENTS_SYNC_ENGINE_IMPL_SYNCER_PROTO_UTIL_H_
|
|
|
| #include <string>
|
|
|
| #include "base/gtest_prod_util.h"
|
| #include "base/macros.h"
|
| #include "base/time/time.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 "sync/sessions/sync_session.h"
|
| +#include "components/sync/base/model_type.h"
|
| +#include "components/sync/base/sync_export.h"
|
| +#include "components/sync/base/syncer_error.h"
|
| +#include "components/sync/sessions_impl/sync_session.h"
|
|
|
| namespace sync_pb {
|
| class ClientToServerMessage;
|
| @@ -83,7 +83,8 @@ class SYNC_EXPORT SyncerProtoUtil {
|
| // EntitySpecifics is used as a filter for the GetUpdates message to tell
|
| // the server which datatypes to send back. This adds a datatype so that
|
| // it's included in the filter.
|
| - static void AddToEntitySpecificDatatypesFilter(ModelType datatype,
|
| + static void AddToEntitySpecificDatatypesFilter(
|
| + ModelType datatype,
|
| sync_pb::EntitySpecifics* filter);
|
|
|
| // Get a debug string representation of the client to server response.
|
| @@ -102,7 +103,6 @@ class SYNC_EXPORT SyncerProtoUtil {
|
| static void AddBagOfChips(syncable::Directory* dir,
|
| sync_pb::ClientToServerMessage* msg);
|
|
|
| -
|
| // Set the protocol version field in the outgoing message.
|
| static void SetProtocolVersion(sync_pb::ClientToServerMessage* msg);
|
|
|
| @@ -150,4 +150,4 @@ class SYNC_EXPORT SyncerProtoUtil {
|
|
|
| } // namespace syncer
|
|
|
| -#endif // SYNC_ENGINE_SYNCER_PROTO_UTIL_H_
|
| +#endif // COMPONENTS_SYNC_ENGINE_IMPL_SYNCER_PROTO_UTIL_H_
|
|
|