diff options
| author | anujk.sharma <anujk.sharma@samsung.com> | 2015-05-05 05:00:55 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-05-05 12:01:34 +0000 |
| commit | 332a1b2b1d5635199d5ed453f5f9586b2e030b64 (patch) | |
| tree | cdf677fa1a51b3f8628b563c0333c0fed8dfb0cd /mojo/common | |
| parent | 6a179254d7d55b3987eb4d1a2c64aa5ad1de5d76 (diff) | |
| download | chromium_src-332a1b2b1d5635199d5ed453f5f9586b2e030b64.zip chromium_src-332a1b2b1d5635199d5ed453f5f9586b2e030b64.tar.gz chromium_src-332a1b2b1d5635199d5ed453f5f9586b2e030b64.tar.bz2 | |
Replace MessageLoopProxy usage with ThreadTaskRunnerHandle in mojo module.
MessageLoopProxy is deprecated.
This basically does a search and replace:
MessageLoopProxy::current() -> ThreadTaskRunnerHandle::Get().
BUG=391045
Review URL: https://codereview.chromium.org/1118473002
Cr-Commit-Position: refs/heads/master@{#328311}
Diffstat (limited to 'mojo/common')
| -rw-r--r-- | mojo/common/handle_watcher.cc | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/mojo/common/handle_watcher.cc b/mojo/common/handle_watcher.cc index 79cdcdb..8d20b16 100644 --- a/mojo/common/handle_watcher.cc +++ b/mojo/common/handle_watcher.cc @@ -14,9 +14,10 @@ #include "base/memory/singleton.h" #include "base/memory/weak_ptr.h" #include "base/message_loop/message_loop.h" -#include "base/message_loop/message_loop_proxy.h" +#include "base/single_thread_task_runner.h" #include "base/synchronization/lock.h" #include "base/synchronization/waitable_event.h" +#include "base/thread_task_runner_handle.h" #include "base/threading/thread.h" #include "base/threading/thread_restrictions.h" #include "base/time/time.h" @@ -43,14 +44,14 @@ struct WatchData { WatchData() : id(0), handle_signals(MOJO_HANDLE_SIGNAL_NONE), - message_loop(NULL) {} + task_runner(NULL) {} WatcherID id; Handle handle; MojoHandleSignals handle_signals; base::TimeTicks deadline; base::Callback<void(MojoResult)> callback; - scoped_refptr<base::MessageLoopProxy> message_loop; + scoped_refptr<base::SingleThreadTaskRunner> task_runner; }; // WatcherBackend -------------------------------------------------------------- @@ -124,7 +125,7 @@ void WatcherBackend::RemoveAndNotify(const Handle& handle, handle_to_data_.erase(handle); MessagePumpMojo::current()->RemoveHandler(handle); - data.message_loop->PostTask(FROM_HERE, base::Bind(data.callback, result)); + data.task_runner->PostTask(FROM_HERE, base::Bind(data.callback, result)); } bool WatcherBackend::GetMojoHandleByWatcherID(WatcherID watcher_id, @@ -238,9 +239,9 @@ WatcherID WatcherThreadManager::StartWatching( request_data.start_data.callback = callback; request_data.start_data.handle_signals = handle_signals; request_data.start_data.deadline = deadline; - request_data.start_data.message_loop = base::MessageLoopProxy::current(); - DCHECK_NE(static_cast<base::MessageLoopProxy*>(NULL), - request_data.start_data.message_loop.get()); + request_data.start_data.task_runner = base::ThreadTaskRunnerHandle::Get(); + DCHECK_NE(static_cast<base::SingleThreadTaskRunner*>(NULL), + request_data.start_data.task_runner.get()); AddRequest(request_data); return request_data.start_data.id; } |