Move IsOfficialBuild() and IsNormalBootMode() into HardwareInterface.
This makes the implementation of the two methods part of the
HardwareInterface, so that unit tests won't end up with meaningless
(and unpredictable) calls to the real functions.
BUG=None
TEST=unit tests
Change-Id: Ia23932634124987c1d6ff0683acb15cf4819bc5e
Reviewed-on: https://chromium-review.googlesource.com/175024
Reviewed-by: Chris Sosa <sosa@chromium.org>
Commit-Queue: Richard Barnette <jrbarnette@chromium.org>
Tested-by: Richard Barnette <jrbarnette@chromium.org>
diff --git a/omaha_request_params.cc b/omaha_request_params.cc
index a8de28f..065d5bb 100644
--- a/omaha_request_params.cc
+++ b/omaha_request_params.cc
@@ -250,7 +250,8 @@
if (force_lock_down_) {
return forced_lock_down_;
}
- return utils::IsOfficialBuild() && utils::IsNormalBootMode();
+ return system_state_->hardware()->IsOfficialBuild() &&
+ system_state_->hardware()->IsNormalBootMode();
}
bool OmahaRequestParams::IsValidChannel(const std::string& channel) const {