diff options
| author | Gilad Arnold <garnold@chromium.org> | 2014-07-18 23:39:38 -0700 |
|---|---|---|
| committer | chrome-internal-fetch <chrome-internal-fetch@google.com> | 2014-07-25 03:41:14 +0000 |
| commit | 44dc3bfd45eaddc1e7b586f8839babe4540418b5 (patch) | |
| tree | 78365ebd32058e0af5879ff9714d5a7fbbc41512 /update_manager/update_manager_unittest.cc | |
| parent | a23e408368ad34e21ee90ebd0dcb55cd03417d22 (diff) | |
update_engine: UM: UpdateCheckAllowed now considers interactive update requests.
This is necessary so we can delegate handling of all update checks to
the UpdateManager, allowing us to share logic between the two cases and
eliminate multiple entry point to UpdateAttempter::Update() and handling
of interference between these two processes. Instead, these are all
handled naturally by the UpdateManager.
BUG=chromium:394389
TEST=Unit tests.
Change-Id: I32a1ab917e5aeb5c2da1953d8b0ffa8c9d8d62f9
Reviewed-on: https://chromium-review.googlesource.com/209100
Reviewed-by: Gilad Arnold <garnold@chromium.org>
Tested-by: Gilad Arnold <garnold@chromium.org>
Commit-Queue: Gilad Arnold <garnold@chromium.org>
Diffstat (limited to 'update_manager/update_manager_unittest.cc')
| -rw-r--r-- | update_manager/update_manager_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/update_manager/update_manager_unittest.cc b/update_manager/update_manager_unittest.cc index 048a0d93..32fd5acd 100644 --- a/update_manager/update_manager_unittest.cc +++ b/update_manager/update_manager_unittest.cc @@ -198,8 +198,8 @@ TEST_F(UmUpdateManagerTest, AsyncPolicyRequestDelaysEvaluation) { umut_->set_policy(new FailingPolicy()); vector<pair<EvalStatus, UpdateCheckParams>> calls; - Callback<void(EvalStatus, const UpdateCheckParams& result)> callback = - Bind(AccumulateCallsCallback<UpdateCheckParams>, &calls); + Callback<void(EvalStatus, const UpdateCheckParams&)> callback = Bind( + AccumulateCallsCallback<UpdateCheckParams>, &calls); umut_->AsyncPolicyRequest(callback, base::TimeDelta::FromSeconds(5), &Policy::UpdateCheckAllowed); |