| Index: components/sync/engine_impl/process_updates_util.cc
|
| diff --git a/components/sync/engine_impl/process_updates_util.cc b/components/sync/engine_impl/process_updates_util.cc
|
| index b4a2da6c52bd45483ce43011b2bccdf440990860..a4abf295844efacf0cdb70e59e3411dfc44ca890 100644
|
| --- a/components/sync/engine_impl/process_updates_util.cc
|
| +++ b/components/sync/engine_impl/process_updates_util.cc
|
| @@ -13,10 +13,10 @@
|
| #include "base/metrics/sparse_histogram.h"
|
| #include "components/sync/base/cryptographer.h"
|
| #include "components/sync/base/data_type_histogram.h"
|
| +#include "components/sync/engine/cycle/update_counters.h"
|
| #include "components/sync/engine_impl/syncer_proto_util.h"
|
| #include "components/sync/engine_impl/syncer_types.h"
|
| #include "components/sync/engine_impl/syncer_util.h"
|
| -#include "components/sync/sessions/update_counters.h"
|
| #include "components/sync/syncable/directory.h"
|
| #include "components/sync/syncable/model_neutral_mutable_entry.h"
|
| #include "components/sync/syncable/syncable_model_neutral_write_transaction.h"
|
| @@ -25,8 +25,6 @@
|
|
|
| namespace syncer {
|
|
|
| -using sessions::StatusController;
|
| -
|
| using syncable::GET_BY_ID;
|
|
|
| namespace {
|
| @@ -282,7 +280,7 @@ void ProcessDownloadedUpdates(syncable::Directory* dir,
|
| syncable::ModelNeutralWriteTransaction* trans,
|
| ModelType type,
|
| const SyncEntityList& applicable_updates,
|
| - sessions::StatusController* status,
|
| + StatusController* status,
|
| UpdateCounters* counters) {
|
| for (SyncEntityList::const_iterator update_it = applicable_updates.begin();
|
| update_it != applicable_updates.end(); ++update_it) {
|
|
|