Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5)

Unified Diff: tools/android/forwarder2/forwarders_manager.cc

Issue 1641513004: Update //base to chromium 9659b08ea5a34f889dc4166217f438095ddc10d2 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « tools/android/forwarder2/device_listener.cc ('k') | tools/android/forwarder2/host_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/android/forwarder2/forwarders_manager.cc
diff --git a/tools/android/forwarder2/forwarders_manager.cc b/tools/android/forwarder2/forwarders_manager.cc
index 0c0c90471cca1c4ea177a12b6e5b53f57a2d08fc..3148e221855ad80b42367dfd135bbe73970de9ff 100644
--- a/tools/android/forwarder2/forwarders_manager.cc
+++ b/tools/android/forwarder2/forwarders_manager.cc
@@ -14,8 +14,8 @@
#include "base/callback_helpers.h"
#include "base/location.h"
#include "base/logging.h"
-#include "base/message_loop/message_loop_proxy.h"
#include "base/posix/eintr_wrapper.h"
+#include "base/task_runner.h"
#include "tools/android/forwarder2/forwarder.h"
#include "tools/android/forwarder2/socket.h"
@@ -35,7 +35,7 @@ void ForwardersManager::CreateAndStartNewForwarder(scoped_ptr<Socket> socket1,
scoped_ptr<Socket> socket2) {
// Note that the internal Forwarder vector is populated on the internal thread
// which is the only thread from which it's accessed.
- thread_.message_loop_proxy()->PostTask(
+ thread_.task_runner()->PostTask(
FROM_HERE,
base::Bind(&ForwardersManager::CreateNewForwarderOnInternalThread,
base::Unretained(this), base::Passed(&socket1),
@@ -49,19 +49,18 @@ void ForwardersManager::CreateAndStartNewForwarder(scoped_ptr<Socket> socket1,
void ForwardersManager::CreateNewForwarderOnInternalThread(
scoped_ptr<Socket> socket1,
scoped_ptr<Socket> socket2) {
- DCHECK(thread_.message_loop_proxy()->RunsTasksOnCurrentThread());
+ DCHECK(thread_.task_runner()->RunsTasksOnCurrentThread());
forwarders_.push_back(new Forwarder(socket1.Pass(), socket2.Pass()));
}
void ForwardersManager::WaitForEventsOnInternalThreadSoon() {
- thread_.message_loop_proxy()->PostTask(
- FROM_HERE,
- base::Bind(&ForwardersManager::WaitForEventsOnInternalThread,
- base::Unretained(this)));
+ thread_.task_runner()->PostTask(
+ FROM_HERE, base::Bind(&ForwardersManager::WaitForEventsOnInternalThread,
+ base::Unretained(this)));
}
void ForwardersManager::WaitForEventsOnInternalThread() {
- DCHECK(thread_.message_loop_proxy()->RunsTasksOnCurrentThread());
+ DCHECK(thread_.task_runner()->RunsTasksOnCurrentThread());
fd_set read_fds;
fd_set write_fds;
« no previous file with comments | « tools/android/forwarder2/device_listener.cc ('k') | tools/android/forwarder2/host_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698