| Index: components/sync/test/fake_server/bookmark_entity_builder.cc
|
| diff --git a/sync/test/fake_server/bookmark_entity_builder.cc b/components/sync/test/fake_server/bookmark_entity_builder.cc
|
| similarity index 80%
|
| rename from sync/test/fake_server/bookmark_entity_builder.cc
|
| rename to components/sync/test/fake_server/bookmark_entity_builder.cc
|
| index 5b9aee01db4b14c3c686f1ff3db1c467e5bce138..7985b93dec57bd3a9d9756f331c39c82efdf17a3 100644
|
| --- a/sync/test/fake_server/bookmark_entity_builder.cc
|
| +++ b/components/sync/test/fake_server/bookmark_entity_builder.cc
|
| @@ -2,7 +2,7 @@
|
| // 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/bookmark_entity_builder.h"
|
| +#include "components/sync/test/fake_server/bookmark_entity_builder.h"
|
|
|
| #include <stdint.h>
|
|
|
| @@ -12,13 +12,13 @@
|
| #include "base/guid.h"
|
| #include "base/memory/ptr_util.h"
|
| #include "base/time/time.h"
|
| -#include "sync/internal_api/public/base/model_type.h"
|
| -#include "sync/internal_api/public/base/unique_position.h"
|
| -#include "sync/protocol/sync.pb.h"
|
| -#include "sync/syncable/syncable_util.h"
|
| -#include "sync/test/fake_server/bookmark_entity.h"
|
| -#include "sync/test/fake_server/fake_server_entity.h"
|
| -#include "sync/util/time.h"
|
| +#include "components/sync/base/model_type.h"
|
| +#include "components/sync/base/time.h"
|
| +#include "components/sync/base/unique_position.h"
|
| +#include "components/sync/protocol/sync.pb.h"
|
| +#include "components/sync/syncable/syncable_util.h"
|
| +#include "components/sync/test/fake_server/bookmark_entity.h"
|
| +#include "components/sync/test/fake_server/fake_server_entity.h"
|
| #include "url/gurl.h"
|
|
|
| using std::string;
|
| @@ -40,14 +40,12 @@ BookmarkEntityBuilder::BookmarkEntityBuilder(
|
| const string& originator_client_item_id)
|
| : title_(title),
|
| originator_cache_guid_(originator_cache_guid),
|
| - originator_client_item_id_(originator_client_item_id) {
|
| -}
|
| + originator_client_item_id_(originator_client_item_id) {}
|
|
|
| BookmarkEntityBuilder::BookmarkEntityBuilder(
|
| const BookmarkEntityBuilder& other) = default;
|
|
|
| -BookmarkEntityBuilder::~BookmarkEntityBuilder() {
|
| -}
|
| +BookmarkEntityBuilder::~BookmarkEntityBuilder() {}
|
|
|
| void BookmarkEntityBuilder::SetParentId(const std::string& parent_id) {
|
| parent_id_ = parent_id;
|
| @@ -86,16 +84,15 @@ std::unique_ptr<FakeServerEntity> BookmarkEntityBuilder::Build(
|
| sync_pb::UniquePosition unique_position;
|
| // TODO(pvalenzuela): Allow caller customization of the position integer.
|
| const string suffix = GenerateSyncableBookmarkHash(
|
| - originator_cache_guid_,
|
| - originator_client_item_id_);
|
| + originator_cache_guid_, originator_client_item_id_);
|
| syncer::UniquePosition::FromInt64(0, suffix).ToProto(&unique_position);
|
|
|
| if (parent_id_.empty()) {
|
| parent_id_ = FakeServerEntity::CreateId(syncer::BOOKMARKS, "bookmark_bar");
|
| }
|
|
|
| - const string id = FakeServerEntity::CreateId(syncer::BOOKMARKS,
|
| - base::GenerateGUID());
|
| + const string id =
|
| + FakeServerEntity::CreateId(syncer::BOOKMARKS, base::GenerateGUID());
|
|
|
| return base::WrapUnique<FakeServerEntity>(new BookmarkEntity(
|
| id, kUnusedVersion, title_, originator_cache_guid_,
|
|
|