| Index: components/sync/test/fake_server/fake_server_entity.cc
|
| diff --git a/sync/test/fake_server/fake_server_entity.cc b/components/sync/test/fake_server/fake_server_entity.cc
|
| similarity index 89%
|
| rename from sync/test/fake_server/fake_server_entity.cc
|
| rename to components/sync/test/fake_server/fake_server_entity.cc
|
| index e8dad1b06458731ae540b54b1e22de4d055c2934..3bb5301eaa24f60815c61271fea48fa645567c5c 100644
|
| --- a/sync/test/fake_server/fake_server_entity.cc
|
| +++ b/components/sync/test/fake_server/fake_server_entity.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/fake_server_entity.h"
|
| +#include "components/sync/test/fake_server/fake_server_entity.h"
|
|
|
| #include <stdint.h>
|
|
|
| @@ -18,10 +18,10 @@
|
| #include "base/strings/string_split.h"
|
| #include "base/strings/string_util.h"
|
| #include "base/strings/stringprintf.h"
|
| +#include "components/sync/base/model_type.h"
|
| +#include "components/sync/protocol/sync.pb.h"
|
| #include "net/base/net_errors.h"
|
| #include "net/http/http_status_code.h"
|
| -#include "sync/internal_api/public/base/model_type.h"
|
| -#include "sync/protocol/sync.pb.h"
|
|
|
| using std::string;
|
| using std::vector;
|
| @@ -37,7 +37,7 @@ const char kIdSeparator[] = "_";
|
|
|
| namespace fake_server {
|
|
|
| -FakeServerEntity::~FakeServerEntity() { }
|
| +FakeServerEntity::~FakeServerEntity() {}
|
|
|
| const std::string& FakeServerEntity::GetId() const {
|
| return id_;
|
| @@ -84,17 +84,14 @@ bool FakeServerEntity::IsPermanent() const {
|
| string FakeServerEntity::CreateId(const ModelType& model_type,
|
| const string& inner_id) {
|
| int field_number = GetSpecificsFieldNumberFromModelType(model_type);
|
| - return base::StringPrintf("%d%s%s",
|
| - field_number,
|
| - kIdSeparator,
|
| + return base::StringPrintf("%d%s%s", field_number, kIdSeparator,
|
| inner_id.c_str());
|
| }
|
|
|
| // static
|
| std::string FakeServerEntity::GetTopLevelId(const ModelType& model_type) {
|
| - return FakeServerEntity::CreateId(
|
| - model_type,
|
| - syncer::ModelTypeToRootTag(model_type));
|
| + return FakeServerEntity::CreateId(model_type,
|
| + syncer::ModelTypeToRootTag(model_type));
|
| }
|
|
|
| // static
|
|
|