Move simple firmware related queries into HardwareInterface.
This change moves the following functions from utils to
HardwareInterface:
GetHardwareClass()
GetFirmwareVersion()
GetECVersion()
BUG=None
TEST=unit tests
Change-Id: I20047a3fac8cca3c36730fef305751e6da3c2bb5
Reviewed-on: https://chromium-review.googlesource.com/174930
Commit-Queue: Richard Barnette <jrbarnette@chromium.org>
Tested-by: Richard Barnette <jrbarnette@chromium.org>
Reviewed-by: Chris Sosa <sosa@chromium.org>
diff --git a/omaha_request_params.cc b/omaha_request_params.cc
index ea25c74..a8de28f 100644
--- a/omaha_request_params.cc
+++ b/omaha_request_params.cc
@@ -17,6 +17,7 @@
#include <policy/device_policy.h>
#include "update_engine/constants.h"
+#include "update_engine/hardware_interface.h"
#include "update_engine/simple_key_value_store.h"
#include "update_engine/system_state.h"
#include "update_engine/utils.h"
@@ -78,10 +79,10 @@
NULL,
stateful_override);
app_lang_ = "en-US";
- hwid_ = utils::GetHardwareClass();
+ hwid_ = system_state_->hardware()->GetHardwareClass();
if (CollectECFWVersions()) {
- fw_version_ = utils::GetFirmwareVersion();
- ec_version_ = utils::GetECVersion();
+ fw_version_ = system_state_->hardware()->GetFirmwareVersion();
+ ec_version_ = system_state_->hardware()->GetECVersion();
}
if (current_channel_ == target_channel_) {