diff options
| author | Qijiang Fan <fqj@chromium.org> | 2020-10-15 21:54:11 +0900 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-10-23 17:18:27 +0000 |
| commit | b0b6cc2b0cfe7a5313b1b416424409be6ea05eb0 (patch) | |
| tree | d363182c40bf9331dda19ce48f73849714fb0329 /common/subprocess_unittest.cc | |
| parent | 852f57d536a8541f080e1f1feafa9e5c32dc73a5 (diff) | |
update_engine: remove usages of base::MessageLoop.
It's replaced by base::SingleThreadTaskExecutor.
BUG=chromium:1094927
TEST=unittest
Change-Id: I281063564037a2ccf1b93d00253180a0000abd09
Reviewed-on: https://chromium-review.googlesource.com/c/aosp/platform/system/update_engine/+/2474955
Commit-Queue: Qijiang Fan <fqj@google.com>
Tested-by: Qijiang Fan <fqj@google.com>
Reviewed-by: Amin Hassani <ahassani@chromium.org>
Diffstat (limited to 'common/subprocess_unittest.cc')
| -rw-r--r-- | common/subprocess_unittest.cc | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/common/subprocess_unittest.cc b/common/subprocess_unittest.cc index b4d068f0..ff4158e8 100644 --- a/common/subprocess_unittest.cc +++ b/common/subprocess_unittest.cc @@ -28,9 +28,14 @@ #include <base/bind.h> #include <base/files/scoped_temp_dir.h> #include <base/location.h> +#if BASE_VER < 780000 // Android #include <base/message_loop/message_loop.h> +#endif // BASE_VER < 780000 #include <base/strings/string_util.h> #include <base/strings/stringprintf.h> +#if BASE_VER >= 780000 // Chrome OS +#include <base/task/single_thread_task_executor.h> +#endif // BASE_VER >= 780000 #include <base/time/time.h> #include <brillo/message_loops/base_message_loop.h> #include <brillo/message_loops/message_loop.h> @@ -70,8 +75,13 @@ class SubprocessTest : public ::testing::Test { subprocess_.Init(&async_signal_handler_); } +#if BASE_VER < 780000 // Android base::MessageLoopForIO base_loop_; brillo::BaseMessageLoop loop_{&base_loop_}; +#else // Chrome OS + base::SingleThreadTaskExecutor base_loop_{base::MessagePumpType::IO}; + brillo::BaseMessageLoop loop_{base_loop_.task_runner()}; +#endif // BASE_VER < 780000 brillo::AsynchronousSignalHandler async_signal_handler_; Subprocess subprocess_; unique_ptr<base::FileDescriptorWatcher::Controller> watcher_; |