Index: components/sync/engine_impl/non_blocking_type_commit_contribution.cc |
diff --git a/sync/engine/non_blocking_type_commit_contribution.cc b/components/sync/engine_impl/non_blocking_type_commit_contribution.cc |
similarity index 92% |
rename from sync/engine/non_blocking_type_commit_contribution.cc |
rename to components/sync/engine_impl/non_blocking_type_commit_contribution.cc |
index 5e845c8eefaad20ac74d230dc443fef628b74859..28d9ed59eaceaea49265a524d04fc6d77724bc59 100644 |
--- a/sync/engine/non_blocking_type_commit_contribution.cc |
+++ b/components/sync/engine_impl/non_blocking_type_commit_contribution.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/engine/non_blocking_type_commit_contribution.h" |
+#include "components/sync/engine_impl/non_blocking_type_commit_contribution.h" |
#include <stddef.h> |
#include <stdint.h> |
@@ -10,9 +10,9 @@ |
#include <algorithm> |
#include "base/values.h" |
-#include "sync/engine/model_type_worker.h" |
-#include "sync/internal_api/public/non_blocking_sync_common.h" |
-#include "sync/protocol/proto_value_conversions.h" |
+#include "components/sync/core/non_blocking_sync_common.h" |
+#include "components/sync/engine_impl/model_type_worker.h" |
+#include "components/sync/protocol/proto_value_conversions.h" |
namespace syncer_v2 { |
@@ -34,8 +34,7 @@ void NonBlockingTypeCommitContribution::AddToCommitMessage( |
sync_pb::CommitMessage* commit_message = msg->mutable_commit(); |
entries_start_index_ = commit_message->entries_size(); |
- std::copy(entities_.begin(), |
- entities_.end(), |
+ std::copy(entities_.begin(), entities_.end(), |
RepeatedPtrFieldBackInserter(commit_message->mutable_entries())); |
if (!context_.context().empty()) |
commit_message->add_client_contexts()->CopyFrom(context_); |