Index: components/sync/syncable/mutable_entry.cc |
diff --git a/sync/syncable/mutable_entry.cc b/components/sync/syncable/mutable_entry.cc |
similarity index 90% |
rename from sync/syncable/mutable_entry.cc |
rename to components/sync/syncable/mutable_entry.cc |
index 160a6dfbf034fd9554cf86a722d1c10199f3f9c5..25ea5a434d4adc21ca0911a4708ec93b8747364b 100644 |
--- a/sync/syncable/mutable_entry.cc |
+++ b/components/sync/syncable/mutable_entry.cc |
@@ -2,20 +2,20 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "sync/syncable/mutable_entry.h" |
+#include "components/sync/syncable/mutable_entry.h" |
#include <stdint.h> |
#include <memory> |
-#include "sync/internal_api/public/base/unique_position.h" |
-#include "sync/syncable/directory.h" |
-#include "sync/syncable/scoped_kernel_lock.h" |
-#include "sync/syncable/scoped_parent_child_index_updater.h" |
-#include "sync/syncable/syncable-inl.h" |
-#include "sync/syncable/syncable_changes_version.h" |
-#include "sync/syncable/syncable_util.h" |
-#include "sync/syncable/syncable_write_transaction.h" |
+#include "components/sync/base/unique_position.h" |
+#include "components/sync/syncable/directory.h" |
+#include "components/sync/syncable/scoped_kernel_lock.h" |
+#include "components/sync/syncable/scoped_parent_child_index_updater.h" |
+#include "components/sync/syncable/syncable-inl.h" |
+#include "components/sync/syncable/syncable_changes_version.h" |
+#include "components/sync/syncable/syncable_util.h" |
+#include "components/sync/syncable/syncable_write_transaction.h" |
using std::string; |
@@ -96,15 +96,15 @@ MutableEntry::MutableEntry(WriteTransaction* trans, |
DCHECK(result); |
} |
-MutableEntry::MutableEntry(WriteTransaction* trans, CreateNewUpdateItem, |
+MutableEntry::MutableEntry(WriteTransaction* trans, |
+ CreateNewUpdateItem, |
const Id& id) |
: ModelNeutralMutableEntry(trans, CREATE_NEW_UPDATE_ITEM, id), |
write_transaction_(trans) {} |
MutableEntry::MutableEntry(WriteTransaction* trans, GetById, const Id& id) |
: ModelNeutralMutableEntry(trans, GET_BY_ID, id), |
- write_transaction_(trans) { |
-} |
+ write_transaction_(trans) {} |
MutableEntry::MutableEntry(WriteTransaction* trans, |
GetByHandle, |
@@ -112,16 +112,15 @@ MutableEntry::MutableEntry(WriteTransaction* trans, |
: ModelNeutralMutableEntry(trans, GET_BY_HANDLE, metahandle), |
write_transaction_(trans) {} |
-MutableEntry::MutableEntry(WriteTransaction* trans, GetByClientTag, |
+MutableEntry::MutableEntry(WriteTransaction* trans, |
+ GetByClientTag, |
const std::string& tag) |
: ModelNeutralMutableEntry(trans, GET_BY_CLIENT_TAG, tag), |
- write_transaction_(trans) { |
-} |
+ write_transaction_(trans) {} |
MutableEntry::MutableEntry(WriteTransaction* trans, GetTypeRoot, ModelType type) |
: ModelNeutralMutableEntry(trans, GET_TYPE_ROOT, type), |
- write_transaction_(trans) { |
-} |
+ write_transaction_(trans) {} |
void MutableEntry::PutLocalExternalId(int64_t value) { |
DCHECK(kernel_); |
@@ -202,7 +201,7 @@ void MutableEntry::PutIsDel(bool value) { |
// Some indices don't include deleted items and must be updated |
// upon a value change. |
ScopedParentChildIndexUpdater updater(lock, kernel_, |
- &dir()->kernel()->parent_child_index); |
+ &dir()->kernel()->parent_child_index); |
kernel_->put(IS_DEL, value); |
MarkDirty(); |
@@ -245,8 +244,8 @@ void MutableEntry::PutUniquePosition(const UniquePosition& value) { |
// We should never overwrite a valid position with an invalid one. |
DCHECK(value.IsValid()); |
ScopedKernelLock lock(dir()); |
- ScopedParentChildIndexUpdater updater( |
- lock, kernel_, &dir()->kernel()->parent_child_index); |
+ ScopedParentChildIndexUpdater updater(lock, kernel_, |
+ &dir()->kernel()->parent_child_index); |
kernel_->put(UNIQUE_POSITION, value); |
MarkDirty(); |
} |