| Index: chrome/browser/sync/glue/sync_backend_host.cc
|
| diff --git a/chrome/browser/sync/glue/sync_backend_host.cc b/chrome/browser/sync/glue/sync_backend_host.cc
|
| index ccf8bf65fa0d5eb0b56e3515e465edea028827a2..01dc9860765f25a066de858e9240f23362afa9c0 100644
|
| --- a/chrome/browser/sync/glue/sync_backend_host.cc
|
| +++ b/chrome/browser/sync/glue/sync_backend_host.cc
|
| @@ -116,7 +116,7 @@ class SyncBackendHost::Core
|
| virtual void OnNotificationsDisabled(
|
| syncer::NotificationsDisabledReason reason) OVERRIDE;
|
| virtual void OnIncomingNotification(
|
| - const syncer::ObjectIdPayloadMap& id_payloads,
|
| + const syncer::ObjectIdStateMap& id_state_map,
|
| syncer::IncomingNotificationSource source) OVERRIDE;
|
|
|
| // Note:
|
| @@ -1037,14 +1037,14 @@ void SyncBackendHost::Core::OnNotificationsDisabled(
|
| }
|
|
|
| void SyncBackendHost::Core::OnIncomingNotification(
|
| - const syncer::ObjectIdPayloadMap& id_payloads,
|
| + const syncer::ObjectIdStateMap& id_state_map,
|
| syncer::IncomingNotificationSource source) {
|
| if (!sync_loop_)
|
| return;
|
| DCHECK_EQ(MessageLoop::current(), sync_loop_);
|
| host_.Call(FROM_HERE,
|
| &SyncBackendHost::HandleIncomingNotificationOnFrontendLoop,
|
| - id_payloads, source);
|
| + id_state_map, source);
|
| }
|
|
|
| void SyncBackendHost::Core::DoInitialize(const DoInitializeOptions& options) {
|
| @@ -1427,12 +1427,12 @@ void SyncBackendHost::HandleNotificationsDisabledOnFrontendLoop(
|
| }
|
|
|
| void SyncBackendHost::HandleIncomingNotificationOnFrontendLoop(
|
| - const syncer::ObjectIdPayloadMap& id_payloads,
|
| + const syncer::ObjectIdStateMap& id_state_map,
|
| syncer::IncomingNotificationSource source) {
|
| if (!frontend_)
|
| return;
|
| DCHECK_EQ(MessageLoop::current(), frontend_loop_);
|
| - frontend_->OnIncomingNotification(id_payloads, source);
|
| + frontend_->OnIncomingNotification(id_state_map, source);
|
| }
|
|
|
| bool SyncBackendHost::CheckPassphraseAgainstCachedPendingKeys(
|
|
|