| Index: components/sync/engine_impl/commit_processor.cc
|
| diff --git a/sync/engine/commit_processor.cc b/components/sync/engine_impl/commit_processor.cc
|
| similarity index 79%
|
| copy from sync/engine/commit_processor.cc
|
| copy to components/sync/engine_impl/commit_processor.cc
|
| index 87e2696e6040bce4b0447a8a054ec507a29764c7..49312bcc41c90f6dd6a478604c662970babad141 100644
|
| --- a/sync/engine/commit_processor.cc
|
| +++ b/components/sync/engine_impl/commit_processor.cc
|
| @@ -2,16 +2,16 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "sync/engine/commit_processor.h"
|
| +#include "components/sync/engine_impl/commit_processor.h"
|
|
|
| #include <stddef.h>
|
|
|
| #include <utility>
|
|
|
| #include "base/metrics/histogram_macros.h"
|
| -#include "sync/engine/commit_contribution.h"
|
| -#include "sync/engine/commit_contributor.h"
|
| -#include "sync/protocol/sync.pb.h"
|
| +#include "components/sync/engine_impl/commit_contribution.h"
|
| +#include "components/sync/engine_impl/commit_contributor.h"
|
| +#include "components/sync/protocol/sync.pb.h"
|
|
|
| namespace syncer {
|
|
|
| @@ -29,14 +29,12 @@ void CommitProcessor::GatherCommitContributions(
|
| bool cookie_jar_empty,
|
| Commit::ContributionMap* contributions) {
|
| size_t num_entries = 0;
|
| - for (ModelTypeSet::Iterator it = commit_types.First();
|
| - it.Good(); it.Inc()) {
|
| + for (ModelTypeSet::Iterator it = commit_types.First(); it.Good(); it.Inc()) {
|
| CommitContributorMap::iterator cm_it =
|
| commit_contributor_map_->find(it.Get());
|
| if (cm_it == commit_contributor_map_->end()) {
|
| - NOTREACHED()
|
| - << "Could not find requested type " << ModelTypeToString(it.Get())
|
| - << " in contributor map.";
|
| + NOTREACHED() << "Could not find requested type "
|
| + << ModelTypeToString(it.Get()) << " in contributor map.";
|
| continue;
|
| }
|
| size_t spaces_remaining = max_entries - num_entries;
|
|
|