diff options
author | Luis Hector Chavez <lhchavez@google.com> | 2016-07-19 14:29:19 -0700 |
---|---|---|
committer | Treehugger Robot <treehugger-gerrit@google.com> | 2016-07-27 16:41:28 +0000 |
commit | f1cf34849efdc0158fb1987ba74a51f25016c5bd (patch) | |
tree | 807b8a3fbe7d94a2d0497ecad4162bbcd5553678 /common/subprocess_unittest.cc | |
parent | 9d66d761f5fdbd7846810954c5245c5391b743c4 (diff) |
update_engine: Update libchrome APIs to r405848
The new libchrome has been ported from Chromium and some APIs have
changed. Make necessary changes at call sites.
Notable changes from libchrome:
- base::Bind() now explicitly disallows captures in lambdas (which was
never allowed in the style guide), so lambdas should now be written in
a way that take the captures as parameters.
Bug: 29104761
Test: All tests in update_engine_unittest pass on dragonboard-eng build
Change-Id: Iec04c126630fd876114076e3cb10cf917c8817b0
Diffstat (limited to 'common/subprocess_unittest.cc')
-rw-r--r-- | common/subprocess_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/subprocess_unittest.cc b/common/subprocess_unittest.cc index cc1f3537..58d4191d 100644 --- a/common/subprocess_unittest.cc +++ b/common/subprocess_unittest.cc @@ -249,13 +249,13 @@ TEST_F(SubprocessTest, CancelTest) { fifo_fd, MessageLoop::WatchMode::kWatchRead, false, - base::Bind([fifo_fd, tag] { + base::Bind([](int fifo_fd, uint32_t tag) { char c; EXPECT_EQ(1, HANDLE_EINTR(read(fifo_fd, &c, 1))); EXPECT_EQ('X', c); LOG(INFO) << "Killing tag " << tag; Subprocess::Get().KillExec(tag); - })); + }, fifo_fd, tag)); // This test would leak a callback that runs when the child process exits // unless we wait for it to run. |