| Index: components/sync/engine_impl/update_applicator.cc
|
| diff --git a/sync/engine/update_applicator.cc b/components/sync/engine_impl/update_applicator.cc
|
| similarity index 85%
|
| rename from sync/engine/update_applicator.cc
|
| rename to components/sync/engine_impl/update_applicator.cc
|
| index 56996398f2257c83d35740b296bc2ed2d90eb4d7..8be5cbce38eceee144dcbe746b5196d7dfa9d9a1 100644
|
| --- a/sync/engine/update_applicator.cc
|
| +++ b/components/sync/engine_impl/update_applicator.cc
|
| @@ -2,18 +2,18 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "sync/engine/update_applicator.h"
|
| +#include "components/sync/engine_impl/update_applicator.h"
|
|
|
| #include <stdint.h>
|
|
|
| #include <vector>
|
|
|
| #include "base/logging.h"
|
| -#include "sync/engine/syncer_util.h"
|
| -#include "sync/syncable/entry.h"
|
| -#include "sync/syncable/mutable_entry.h"
|
| -#include "sync/syncable/syncable_id.h"
|
| -#include "sync/syncable/syncable_write_transaction.h"
|
| +#include "components/sync/engine_impl/syncer_util.h"
|
| +#include "components/sync/syncable/entry.h"
|
| +#include "components/sync/syncable/mutable_entry.h"
|
| +#include "components/sync/syncable/syncable_id.h"
|
| +#include "components/sync/syncable/syncable_write_transaction.h"
|
|
|
| using std::vector;
|
|
|
| @@ -25,11 +25,9 @@ UpdateApplicator::UpdateApplicator(Cryptographer* cryptographer)
|
| : cryptographer_(cryptographer),
|
| updates_applied_(0),
|
| encryption_conflicts_(0),
|
| - hierarchy_conflicts_(0) {
|
| -}
|
| + hierarchy_conflicts_(0) {}
|
|
|
| -UpdateApplicator::~UpdateApplicator() {
|
| -}
|
| +UpdateApplicator::~UpdateApplicator() {}
|
|
|
| // Attempt to apply all updates, using multiple passes if necessary.
|
| //
|
| @@ -57,8 +55,8 @@ void UpdateApplicator::AttemptApplications(
|
| for (std::vector<int64_t>::iterator i = to_apply.begin();
|
| i != to_apply.end(); ++i) {
|
| syncable::MutableEntry entry(trans, syncable::GET_BY_HANDLE, *i);
|
| - UpdateAttemptResponse result = AttemptToUpdateEntry(
|
| - trans, &entry, cryptographer_);
|
| + UpdateAttemptResponse result =
|
| + AttemptToUpdateEntry(trans, &entry, cryptographer_);
|
|
|
| switch (result) {
|
| case SUCCESS:
|
|
|