commit 934b847620e664159f3952eeb3d48c3510a43676
author Tianjie <xunchang@google.com> Wed Jun 24 23:10:49 2020 -0700
committer Tianjie Xu <xunchang@google.com> Thu Jul 23 18:27:50 2020 +0000
tree 933ddf4253b78646ddadf8e061e076d436a4210d
parent ebd5e25c24c787f33a1377d7b5c6d8f6a3bbbd01

Update UE to remove MessageLoop::current()->WatchFileDescriptor.

MessageLoop::current()->WatchFileDescriptor is deprecated. And UE should
remove usages of it.

Test: mma && unittest
Change-Id: Ib1ef2e6b6a38ad2a8d07b78bcd72fdb3b7f82226

common/subprocess.h

diff --git a/common/subprocess.h b/common/subprocess.h
index f1b9f1f..432d4cb 100644
--- a/common/subprocess.h
+++ b/common/subprocess.h
@@ -123,12 +123,8 @@
 
     // These are used to monitor the stdout of the running process, including
     // the stderr if it was redirected.
-#ifdef __ANDROID__
-    brillo::MessageLoop::TaskId stdout_task_id{
-        brillo::MessageLoop::kTaskIdNull};
-#else
     std::unique_ptr<base::FileDescriptorWatcher::Controller> stdout_controller;
-#endif  // __ANDROID__
+
     int stdout_fd{-1};
     std::string stdout;
   };