| Index: components/invalidation/sync_invalidation_listener.cc
|
| diff --git a/components/invalidation/sync_invalidation_listener.cc b/components/invalidation/sync_invalidation_listener.cc
|
| index 7259f73ebd2f2bbdbd00a3e1bcdff14a6c8ef6c9..d7dd8f4089adac44e0ee41c765bdf814380cf52b 100644
|
| --- a/components/invalidation/sync_invalidation_listener.cc
|
| +++ b/components/invalidation/sync_invalidation_listener.cc
|
| @@ -9,7 +9,10 @@
|
| #include "base/bind.h"
|
| #include "base/callback.h"
|
| #include "base/compiler_specific.h"
|
| +#include "base/location.h"
|
| #include "base/logging.h"
|
| +#include "base/single_thread_task_runner.h"
|
| +#include "base/thread_task_runner_handle.h"
|
| #include "base/tracked_objects.h"
|
| #include "components/invalidation/invalidation_util.h"
|
| #include "components/invalidation/object_id_invalidation_map.h"
|
| @@ -137,7 +140,7 @@ void SyncInvalidationListener::Invalidate(
|
|
|
| ObjectIdInvalidationMap invalidations;
|
| Invalidation inv = Invalidation::Init(id, invalidation.version(), payload);
|
| - inv.SetAckHandler(AsWeakPtr(), base::MessageLoopProxy::current());
|
| + inv.SetAckHandler(AsWeakPtr(), base::ThreadTaskRunnerHandle::Get());
|
| invalidations.Insert(inv);
|
|
|
| DispatchInvalidations(invalidations);
|
| @@ -154,7 +157,8 @@ void SyncInvalidationListener::InvalidateUnknownVersion(
|
|
|
| ObjectIdInvalidationMap invalidations;
|
| Invalidation unknown_version = Invalidation::InitUnknownVersion(object_id);
|
| - unknown_version.SetAckHandler(AsWeakPtr(), base::MessageLoopProxy::current());
|
| + unknown_version.SetAckHandler(AsWeakPtr(),
|
| + base::ThreadTaskRunnerHandle::Get());
|
| invalidations.Insert(unknown_version);
|
|
|
| DispatchInvalidations(invalidations);
|
| @@ -175,7 +179,7 @@ void SyncInvalidationListener::InvalidateAll(
|
| it != registered_ids_.end(); ++it) {
|
| Invalidation unknown_version = Invalidation::InitUnknownVersion(*it);
|
| unknown_version.SetAckHandler(AsWeakPtr(),
|
| - base::MessageLoopProxy::current());
|
| + base::ThreadTaskRunnerHandle::Get());
|
| invalidations.Insert(unknown_version);
|
| }
|
|
|
| @@ -358,7 +362,7 @@ void SyncInvalidationListener::DoRegistrationUpdate() {
|
| continue;
|
| }
|
| map_it->second.ExportInvalidations(AsWeakPtr(),
|
| - base::MessageLoopProxy::current(),
|
| + base::ThreadTaskRunnerHandle::Get(),
|
| &object_id_invalidation_map);
|
| }
|
|
|
|
|