| Index: components/sync/engine_impl/get_updates_delegate.cc
|
| diff --git a/sync/engine/get_updates_delegate.cc b/components/sync/engine_impl/get_updates_delegate.cc
|
| similarity index 83%
|
| rename from sync/engine/get_updates_delegate.cc
|
| rename to components/sync/engine_impl/get_updates_delegate.cc
|
| index 8ee88b729b0ad1e0b204ba950dfc2dea3c2ec3d5..88b85fa89f7dbba7119f7099288c9f424a445625 100644
|
| --- a/sync/engine/get_updates_delegate.cc
|
| +++ b/components/sync/engine_impl/get_updates_delegate.cc
|
| @@ -2,22 +2,21 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "sync/engine/get_updates_delegate.h"
|
| +#include "components/sync/engine_impl/get_updates_delegate.h"
|
|
|
| -#include "sync/engine/directory_update_handler.h"
|
| -#include "sync/engine/get_updates_processor.h"
|
| -#include "sync/internal_api/public/events/configure_get_updates_request_event.h"
|
| -#include "sync/internal_api/public/events/normal_get_updates_request_event.h"
|
| -#include "sync/internal_api/public/events/poll_get_updates_request_event.h"
|
| +#include "components/sync/engine/events/configure_get_updates_request_event.h"
|
| +#include "components/sync/engine/events/normal_get_updates_request_event.h"
|
| +#include "components/sync/engine/events/poll_get_updates_request_event.h"
|
| +#include "components/sync/engine_impl/directory_update_handler.h"
|
| +#include "components/sync/engine_impl/get_updates_processor.h"
|
|
|
| namespace syncer {
|
|
|
| namespace {
|
|
|
| -void NonPassiveApplyUpdates(
|
| - ModelTypeSet gu_types,
|
| - sessions::StatusController* status_controller,
|
| - UpdateHandlerMap* update_handler_map) {
|
| +void NonPassiveApplyUpdates(ModelTypeSet gu_types,
|
| + sessions::StatusController* status_controller,
|
| + UpdateHandlerMap* update_handler_map) {
|
| for (UpdateHandlerMap::iterator it = update_handler_map->begin();
|
| it != update_handler_map->end(); ++it) {
|
| if (gu_types.Has(it->first))
|
| @@ -25,10 +24,9 @@ void NonPassiveApplyUpdates(
|
| }
|
| }
|
|
|
| -void PassiveApplyUpdates(
|
| - ModelTypeSet gu_types,
|
| - sessions::StatusController* status_controller,
|
| - UpdateHandlerMap* update_handler_map) {
|
| +void PassiveApplyUpdates(ModelTypeSet gu_types,
|
| + sessions::StatusController* status_controller,
|
| + UpdateHandlerMap* update_handler_map) {
|
| for (UpdateHandlerMap::iterator it = update_handler_map->begin();
|
| it != update_handler_map->end(); ++it) {
|
| if (gu_types.Has(it->first))
|
| @@ -44,7 +42,7 @@ GetUpdatesDelegate::~GetUpdatesDelegate() {}
|
|
|
| NormalGetUpdatesDelegate::NormalGetUpdatesDelegate(
|
| const sessions::NudgeTracker& nudge_tracker)
|
| - : nudge_tracker_(nudge_tracker) {}
|
| + : nudge_tracker_(nudge_tracker) {}
|
|
|
| NormalGetUpdatesDelegate::~NormalGetUpdatesDelegate() {}
|
|
|
| @@ -68,16 +66,15 @@ void NormalGetUpdatesDelegate::HelpPopulateGuMessage(
|
| for (int i = 0; i < get_updates->from_progress_marker_size(); ++i) {
|
| sync_pb::DataTypeProgressMarker* progress_marker =
|
| get_updates->mutable_from_progress_marker(i);
|
| - ModelType type = GetModelTypeFromSpecificsFieldNumber(
|
| - progress_marker->data_type_id());
|
| + ModelType type =
|
| + GetModelTypeFromSpecificsFieldNumber(progress_marker->data_type_id());
|
|
|
| DCHECK(!nudge_tracker_.IsTypeThrottled(type))
|
| << "Throttled types should have been removed from the request_types.";
|
|
|
| nudge_tracker_.SetLegacyNotificationHint(type, progress_marker);
|
| nudge_tracker_.FillProtoMessage(
|
| - type,
|
| - progress_marker->mutable_get_update_triggers());
|
| + type, progress_marker->mutable_get_update_triggers());
|
| }
|
| }
|
|
|
| @@ -96,7 +93,8 @@ std::unique_ptr<ProtocolEvent> NormalGetUpdatesDelegate::GetNetworkRequestEvent(
|
| }
|
|
|
| ConfigureGetUpdatesDelegate::ConfigureGetUpdatesDelegate(
|
| - sync_pb::GetUpdatesCallerInfo::GetUpdatesSource source) : source_(source) {}
|
| + sync_pb::GetUpdatesCallerInfo::GetUpdatesSource source)
|
| + : source_(source) {}
|
|
|
| ConfigureGetUpdatesDelegate::~ConfigureGetUpdatesDelegate() {}
|
|
|
|
|