| Index: components/sync/engine_impl/net/loopback_server/loopback_server_entity.h
|
| diff --git a/components/sync/test/fake_server/fake_server_entity.h b/components/sync/engine_impl/net/loopback_server/loopback_server_entity.h
|
| similarity index 71%
|
| copy from components/sync/test/fake_server/fake_server_entity.h
|
| copy to components/sync/engine_impl/net/loopback_server/loopback_server_entity.h
|
| index 1e0257979822b6ce063df56fa2303f8c5a993488..4784f44e46edd75fddac614e9f3b7036d75eb7ff 100644
|
| --- a/components/sync/test/fake_server/fake_server_entity.h
|
| +++ b/components/sync/engine_impl/net/loopback_server/loopback_server_entity.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 COMPONENTS_SYNC_TEST_FAKE_SERVER_FAKE_SERVER_ENTITY_H_
|
| -#define COMPONENTS_SYNC_TEST_FAKE_SERVER_FAKE_SERVER_ENTITY_H_
|
| +#ifndef COMPONENTS_SYNC_ENGINE_IMPL_NET_LOOPBACK_SERVER_LOOPBACK_SERVER_ENTITY_H_
|
| +#define COMPONENTS_SYNC_ENGINE_IMPL_NET_LOOPBACK_SERVER_LOOPBACK_SERVER_ENTITY_H_
|
|
|
| #include <stdint.h>
|
|
|
| @@ -13,10 +13,10 @@
|
| #include "components/sync/base/model_type.h"
|
| #include "components/sync/protocol/sync.pb.h"
|
|
|
| -namespace fake_server {
|
| +namespace syncer {
|
|
|
| -// The representation of a Sync entity for the fake server.
|
| -class FakeServerEntity {
|
| +// The representation of a Sync entity for the loopback server.
|
| +class LoopbackServerEntity {
|
| public:
|
| // Creates an ID of the form <type><separator><inner-id> where
|
| // <type> is the EntitySpecifics field number for |model_type|, <separator>
|
| @@ -30,12 +30,9 @@ class FakeServerEntity {
|
| // Returns the ID string of the top level node for the specified type.
|
| static std::string GetTopLevelId(const syncer::ModelType& model_type);
|
|
|
| - virtual ~FakeServerEntity();
|
| - const std::string& id() const { return id_; }
|
| - const std::string& client_defined_unique_tag() const {
|
| - return client_defined_unique_tag_;
|
| - }
|
| - syncer::ModelType model_type() const { return model_type_; }
|
| + virtual ~LoopbackServerEntity();
|
| + const std::string& GetId() const;
|
| + syncer::ModelType GetModelType() const;
|
| int64_t GetVersion() const;
|
| void SetVersion(int64_t version);
|
| const std::string& GetName() const;
|
| @@ -44,6 +41,7 @@ class FakeServerEntity {
|
| // Replaces |specifics_| with |updated_specifics|. This method is meant to be
|
| // used to mimic a client commit.
|
| void SetSpecifics(const sync_pb::EntitySpecifics& updated_specifics);
|
| + sync_pb::EntitySpecifics GetSpecifics() const;
|
|
|
| // Common data items needed by server
|
| virtual bool RequiresParentId() const = 0;
|
| @@ -58,8 +56,7 @@ class FakeServerEntity {
|
| // a valid ModelType, UNSPECIFIED is returned.
|
| static syncer::ModelType GetModelTypeFromId(const std::string& id);
|
|
|
| - FakeServerEntity(const std::string& id,
|
| - const std::string& client_defined_unique_tag,
|
| + LoopbackServerEntity(const std::string& id,
|
| const syncer::ModelType& model_type,
|
| int64_t version,
|
| const std::string& name);
|
| @@ -68,13 +65,10 @@ class FakeServerEntity {
|
|
|
| private:
|
| // The entity's ID.
|
| - const std::string id_;
|
| -
|
| - // The tag for this entity. Can be empty for bookmarks or permanent entities.
|
| - const std::string client_defined_unique_tag_;
|
| + std::string id_;
|
|
|
| // The ModelType that categorizes this entity.
|
| - const syncer::ModelType model_type_;
|
| + syncer::ModelType model_type_;
|
|
|
| // The version of this entity.
|
| int64_t version_;
|
| @@ -86,6 +80,6 @@ class FakeServerEntity {
|
| sync_pb::EntitySpecifics specifics_;
|
| };
|
|
|
| -} // namespace fake_server
|
| +} // namespace syncer
|
|
|
| -#endif // COMPONENTS_SYNC_TEST_FAKE_SERVER_FAKE_SERVER_ENTITY_H_
|
| +#endif // COMPONENTS_SYNC_ENGINE_IMPL_NET_LOOPBACK_SERVER_LOOPBACK_SERVER_ENTITY_H_
|
|
|