diff options
author | Eric Caruso <ejcaruso@chromium.org> | 2018-04-09 16:29:33 -0700 |
---|---|---|
committer | chrome-bot <chrome-bot@chromium.org> | 2018-04-11 14:55:45 -0700 |
commit | 69df7cbdda2e7878f6e217670741bf54857baab1 (patch) | |
tree | 5c2099706cf16f32c01f10af78c137612c17754d /brillo | |
parent | 895aba997ff7ce020bdf1823d87fa5b0cbfe58b8 (diff) | |
download | platform_external_libbrillo-69df7cbdda2e7878f6e217670741bf54857baab1.tar.gz platform_external_libbrillo-69df7cbdda2e7878f6e217670741bf54857baab1.tar.bz2 platform_external_libbrillo-69df7cbdda2e7878f6e217670741bf54857baab1.zip |
libbrillo: use task runners instead of message loops
The PostTask, PostDelayedTask, and DeleteSoon methods on message
loops are gone in the new libchrome, so use the task runner API
instead.
BUG=b:37434548
TEST=emerge
Change-Id: I5a5de39e8a496fb1bed9f0f8c82f06d19a436125
Reviewed-on: https://chromium-review.googlesource.com/1003593
Commit-Ready: Eric Caruso <ejcaruso@chromium.org>
Tested-by: Eric Caruso <ejcaruso@chromium.org>
Reviewed-by: Dan Erat <derat@chromium.org>
Diffstat (limited to 'brillo')
-rw-r--r-- | brillo/http/http_transport_curl.cc | 8 | ||||
-rw-r--r-- | brillo/http/http_transport_curl_unittest.cc | 5 |
2 files changed, 8 insertions, 5 deletions
diff --git a/brillo/http/http_transport_curl.cc b/brillo/http/http_transport_curl.cc index ea8ccb5..1bce6fa 100644 --- a/brillo/http/http_transport_curl.cc +++ b/brillo/http/http_transport_curl.cc @@ -208,7 +208,8 @@ std::shared_ptr<http::Connection> Transport::CreateConnection( void Transport::RunCallbackAsync(const tracked_objects::Location& from_here, const base::Closure& callback) { - base::MessageLoopForIO::current()->PostTask(from_here, callback); + base::MessageLoopForIO::current()->task_runner()->PostTask( + from_here, callback); } RequestID Transport::StartAsyncTransfer(http::Connection* connection, @@ -361,7 +362,8 @@ int Transport::MultiSocketCallback(CURL* easy, poll_data->GetWatcher()->StopWatchingFileDescriptor(); // This method can be called indirectly from SocketPollData::OnSocketReady, // so delay destruction of SocketPollData object till the next loop cycle. - base::MessageLoopForIO::current()->DeleteSoon(FROM_HERE, poll_data); + base::MessageLoopForIO::current()->task_runner()->DeleteSoon( + FROM_HERE, poll_data); return 0; } @@ -404,7 +406,7 @@ int Transport::MultiTimerCallback(CURLM* /* multi */, // Cancel any previous timer callbacks. transport->weak_ptr_factory_for_timer_.InvalidateWeakPtrs(); if (timeout_ms >= 0) { - base::MessageLoopForIO::current()->PostDelayedTask( + base::MessageLoopForIO::current()->task_runner()->PostDelayedTask( FROM_HERE, base::Bind(&Transport::OnTimer, transport->weak_ptr_factory_for_timer_.GetWeakPtr()), diff --git a/brillo/http/http_transport_curl_unittest.cc b/brillo/http/http_transport_curl_unittest.cc index c9e9d40..b72017a 100644 --- a/brillo/http/http_transport_curl_unittest.cc +++ b/brillo/http/http_transport_curl_unittest.cc @@ -237,7 +237,8 @@ TEST_F(HttpCurlTransportAsyncTest, StartAsyncTransfer) { int success_call_count = 0; auto success_callback = [&success_call_count, &run_loop]( RequestID /* request_id */, std::unique_ptr<http::Response> /* resp */) { - base::MessageLoop::current()->PostTask(FROM_HERE, run_loop.QuitClosure()); + base::MessageLoop::current()->task_runner()->PostTask( + FROM_HERE, run_loop.QuitClosure()); success_call_count++; }; @@ -301,7 +302,7 @@ TEST_F(HttpCurlTransportAsyncTest, StartAsyncTransfer) { // Just in case something goes wrong and |success_callback| isn't called, // post a time-out quit closure to abort the message loop after 1 second. - message_loop.PostDelayedTask( + message_loop.task_runner()->PostDelayedTask( FROM_HERE, run_loop.QuitClosure(), base::TimeDelta::FromSeconds(1)); run_loop.Run(); EXPECT_EQ(1, success_call_count); |