| Index: components/sync/core_impl/change_reorder_buffer.cc
|
| diff --git a/sync/internal_api/change_reorder_buffer.cc b/components/sync/core_impl/change_reorder_buffer.cc
|
| similarity index 95%
|
| rename from sync/internal_api/change_reorder_buffer.cc
|
| rename to components/sync/core_impl/change_reorder_buffer.cc
|
| index 72af337026f63cdf8b90ae8f22b96ffee7a10bdc..fc021c4c3b862b82465fa7976a749c296042918b 100644
|
| --- a/sync/internal_api/change_reorder_buffer.cc
|
| +++ b/components/sync/core_impl/change_reorder_buffer.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/internal_api/change_reorder_buffer.h"
|
| +#include "components/sync/core_impl/change_reorder_buffer.h"
|
|
|
| #include <stdint.h>
|
|
|
| @@ -12,10 +12,10 @@
|
| #include <utility> // for pair<>
|
|
|
| #include "base/macros.h"
|
| -#include "sync/internal_api/public/base_node.h"
|
| -#include "sync/internal_api/public/base_transaction.h"
|
| -#include "sync/syncable/entry.h"
|
| -#include "sync/syncable/syncable_base_transaction.h"
|
| +#include "components/sync/core/base_node.h"
|
| +#include "components/sync/core/base_transaction.h"
|
| +#include "components/sync/syncable/entry.h"
|
| +#include "components/sync/syncable/syncable_base_transaction.h"
|
|
|
| using std::numeric_limits;
|
| using std::pair;
|
| @@ -35,7 +35,7 @@ class ChangeReorderBuffer::Traversal {
|
| typedef pair<int64_t, int64_t> ParentChildLink;
|
| typedef set<ParentChildLink> LinkSet;
|
|
|
| - Traversal() : top_(kInvalidId) { }
|
| + Traversal() : top_(kInvalidId) {}
|
|
|
| // Expand the traversal so that it includes the node indicated by
|
| // |child_handle|.
|
| @@ -123,11 +123,9 @@ class ChangeReorderBuffer::Traversal {
|
| DISALLOW_COPY_AND_ASSIGN(Traversal);
|
| };
|
|
|
| -ChangeReorderBuffer::ChangeReorderBuffer() {
|
| -}
|
| +ChangeReorderBuffer::ChangeReorderBuffer() {}
|
|
|
| -ChangeReorderBuffer::~ChangeReorderBuffer() {
|
| -}
|
| +ChangeReorderBuffer::~ChangeReorderBuffer() {}
|
|
|
| void ChangeReorderBuffer::PushAddedItem(int64_t id) {
|
| operations_[id] = ChangeRecord::ACTION_ADD;
|
|
|