diff options
| author | Amin Hassani <ahassani@chromium.org> | 2020-09-16 11:19:28 -0700 |
|---|---|---|
| committer | Amin Hassani <ahassani@chromium.org> | 2020-09-17 10:17:36 -0700 |
| commit | e53b39b8b9c5c0871841bbbb86f23657c0b7f91b (patch) | |
| tree | 12746e5e7e4716ba7fc94d3ed5c1a36c4d47d474 /common/mock_action_processor.h | |
| parent | a02a1f1dc837f22226499d9856a949fb180d099a (diff) | |
| parent | 9956320ffa4edb340d20bd7f3c852a9e87437bd3 (diff) | |
update_engine: Merge remote-tracking branch 'cros/upstream' into cros/master
Done with:
git merge cros/upstream --commit -s recursive
- Added EC key support and its unittests.
- Resolved a conlict on error codes. Since Android versions are not
uploading any UMA metrics, I gave the priority to the Android version
Since they can't be changed.
- Changed the openssl functions to get1 version (from get0) version
because of a current issue with gale. Once the issue is resolved we
need to change them back.
- Some remaining styling issues fixed by clang-format
BUG=b:163153182
TEST=CQ passes
TEST=unittests
Change-Id: Ib95034422b92433ce26e28336bc4806b34910d38
Diffstat (limited to 'common/mock_action_processor.h')
| -rw-r--r-- | common/mock_action_processor.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/common/mock_action_processor.h b/common/mock_action_processor.h index 4c62109b..97857764 100644 --- a/common/mock_action_processor.h +++ b/common/mock_action_processor.h @@ -32,6 +32,8 @@ class MockActionProcessor : public ActionProcessor { MOCK_METHOD0(StartProcessing, void()); MOCK_METHOD1(EnqueueAction, void(AbstractAction* action)); + MOCK_METHOD2(ActionComplete, void(AbstractAction*, ErrorCode)); + // This is a legacy workaround described in: // https://github.com/google/googletest/blob/master/googlemock/docs/CookBook.md#legacy-workarounds-for-move-only-types-legacymoveonly void EnqueueAction(std::unique_ptr<AbstractAction> action) override { |