| Index: components/sync/test/fake_server/tombstone_entity.cc
|
| diff --git a/sync/test/fake_server/tombstone_entity.cc b/components/sync/test/fake_server/tombstone_entity.cc
|
| similarity index 75%
|
| rename from sync/test/fake_server/tombstone_entity.cc
|
| rename to components/sync/test/fake_server/tombstone_entity.cc
|
| index 0b62bd89b96551694cbae999bd4e835a68fd79a1..20fa5355348b4a7977b6869411e8243bf5cc3f71 100644
|
| --- a/sync/test/fake_server/tombstone_entity.cc
|
| +++ b/components/sync/test/fake_server/tombstone_entity.cc
|
| @@ -2,13 +2,13 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "sync/test/fake_server/tombstone_entity.h"
|
| +#include "components/sync/test/fake_server/tombstone_entity.h"
|
|
|
| #include <string>
|
|
|
| -#include "sync/internal_api/public/base/model_type.h"
|
| -#include "sync/protocol/sync.pb.h"
|
| -#include "sync/test/fake_server/fake_server_entity.h"
|
| +#include "components/sync/base/model_type.h"
|
| +#include "components/sync/protocol/sync.pb.h"
|
| +#include "components/sync/test/fake_server/fake_server_entity.h"
|
|
|
| using std::string;
|
|
|
| @@ -16,7 +16,7 @@ using syncer::ModelType;
|
|
|
| namespace fake_server {
|
|
|
| -TombstoneEntity::~TombstoneEntity() { }
|
| +TombstoneEntity::~TombstoneEntity() {}
|
|
|
| // static
|
| std::unique_ptr<FakeServerEntity> TombstoneEntity::Create(const string& id) {
|
| @@ -25,8 +25,7 @@ std::unique_ptr<FakeServerEntity> TombstoneEntity::Create(const string& id) {
|
| return std::unique_ptr<FakeServerEntity>(new TombstoneEntity(id, model_type));
|
| }
|
|
|
| -TombstoneEntity::TombstoneEntity(const string& id,
|
| - const ModelType& model_type)
|
| +TombstoneEntity::TombstoneEntity(const string& id, const ModelType& model_type)
|
| : FakeServerEntity(id, model_type, 0, string()) {
|
| sync_pb::EntitySpecifics specifics;
|
| AddDefaultFieldValue(model_type, &specifics);
|
|
|