diff options
Diffstat (limited to 'brillo/http/http_transport_curl.cc')
-rw-r--r-- | brillo/http/http_transport_curl.cc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/brillo/http/http_transport_curl.cc b/brillo/http/http_transport_curl.cc index f7e3b71..109d2c1 100644 --- a/brillo/http/http_transport_curl.cc +++ b/brillo/http/http_transport_curl.cc @@ -40,7 +40,8 @@ class Transport::SocketPollData : public base::MessageLoopForIO::Watcher { : curl_interface_(curl_interface), curl_multi_handle_(curl_multi_handle), transport_(transport), - socket_fd_(socket_fd) {} + socket_fd_(socket_fd), + file_descriptor_watcher_(FROM_HERE) {} // Returns the pointer for the socket-specific file descriptor watcher. base::MessageLoopForIO::FileDescriptorWatcher* GetWatcher() { @@ -203,7 +204,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, @@ -352,7 +354,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; } @@ -395,7 +398,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()), |