diff options
| author | hscham <hscham@chromium.org> | 2020-02-20 12:32:06 +0900 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-04-04 11:51:34 +0000 |
| commit | 00b6aa24548cffae6e979e99722ea2bda95be8fe (patch) | |
| tree | ed01d7c7f66d8bdea4ea7ca2e9ca6d16484f52c4 /payload_generator/extent_ranges_unittest.cc | |
| parent | c48581a0b26c77f900aa7b82bd13f4c6691d474f (diff) | |
update_engine: changes for libchrome r680000 uprev
Changes applied include:
Replace arraysize by base::size.
Replace base::MessageLoop::current()->task_runner by
base::ThreadTaskRunnerHandle::Get, and
base::MessageLoopForIO::current by base::MessageLoopCurrent::IsSet.
Remove use of base::ContainsKey.
Replace base::Int{,64}ToString by base::NumberTostring.
The changes are all compatible with current libchrome r576279.
BUG=chromium:1054279
TEST=unittest
Change-Id: Ibb6027a5070e0e2d4554a6684350168542fedf5e
Reviewed-on: https://chromium-review.googlesource.com/c/aosp/platform/system/update_engine/+/2065691
Reviewed-by: Amin Hassani <ahassani@chromium.org>
Tested-by: Qijiang Fan <fqj@google.com>
Commit-Queue: Qijiang Fan <fqj@google.com>
Diffstat (limited to 'payload_generator/extent_ranges_unittest.cc')
| -rw-r--r-- | payload_generator/extent_ranges_unittest.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/payload_generator/extent_ranges_unittest.cc b/payload_generator/extent_ranges_unittest.cc index 2bcffed2..326e9360 100644 --- a/payload_generator/extent_ranges_unittest.cc +++ b/payload_generator/extent_ranges_unittest.cc @@ -18,6 +18,7 @@ #include <vector> +#include <base/stl_util.h> #include <gtest/gtest.h> #include "update_engine/common/test_utils.h" @@ -53,7 +54,7 @@ void ExpectRangeEq(const ExtentRanges& ranges, #define EXPECT_RANGE_EQ(ranges, var) \ do { \ - ExpectRangeEq(ranges, var, arraysize(var), __LINE__); \ + ExpectRangeEq(ranges, var, base::size(var), __LINE__); \ } while (0) void ExpectRangesOverlapOrTouch(uint64_t a_start, |