| Index: components/sync/syncable/entry.cc
|
| diff --git a/sync/syncable/entry.cc b/components/sync/syncable/entry.cc
|
| similarity index 91%
|
| rename from sync/syncable/entry.cc
|
| rename to components/sync/syncable/entry.cc
|
| index 176178463bce3eb484504743c7a226c2c1734dfc..078587a02d88a50c60e35d3a1fcce67630250ffc 100644
|
| --- a/sync/syncable/entry.cc
|
| +++ b/components/sync/syncable/entry.cc
|
| @@ -2,14 +2,14 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "sync/syncable/entry.h"
|
| +#include "components/sync/syncable/entry.h"
|
|
|
| #include <stdint.h>
|
|
|
| #include <iomanip>
|
|
|
| -#include "sync/syncable/directory.h"
|
| -#include "sync/syncable/syncable_base_transaction.h"
|
| +#include "components/sync/syncable/directory.h"
|
| +#include "components/sync/syncable/syncable_base_transaction.h"
|
|
|
| namespace syncer {
|
| namespace syncable {
|
| @@ -49,8 +49,7 @@ base::DictionaryValue* Entry::ToValue(Cryptographer* cryptographer) const {
|
| entry_info->SetBoolean("good", good());
|
| if (good()) {
|
| entry_info->Set("kernel", kernel_->ToValue(cryptographer));
|
| - entry_info->Set("modelType",
|
| - ModelTypeToValue(GetModelType()));
|
| + entry_info->Set("modelType", ModelTypeToValue(GetModelType()));
|
| entry_info->SetBoolean("existsOnClientBecauseNameIsNonEmpty",
|
| ExistsOnClientBecauseNameIsNonEmpty());
|
| entry_info->SetBoolean("isRoot", IsRoot());
|
| @@ -59,13 +58,13 @@ base::DictionaryValue* Entry::ToValue(Cryptographer* cryptographer) const {
|
| }
|
|
|
| bool Entry::GetSyncing() const {
|
| - DCHECK(kernel_);
|
| - return kernel_->ref(SYNCING);
|
| + DCHECK(kernel_);
|
| + return kernel_->ref(SYNCING);
|
| }
|
|
|
| bool Entry::GetDirtySync() const {
|
| - DCHECK(kernel_);
|
| - return kernel_->ref(DIRTY_SYNC);
|
| + DCHECK(kernel_);
|
| + return kernel_->ref(DIRTY_SYNC);
|
| }
|
|
|
| ModelType Entry::GetServerModelType() const {
|
|
|