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
diff --git a/omaha_request_builder_xml_unittest.cc b/omaha_request_builder_xml_unittest.cc
index 291189d..a804420 100644
--- a/omaha_request_builder_xml_unittest.cc
+++ b/omaha_request_builder_xml_unittest.cc
@@ -368,7 +368,7 @@
1,
CountSubstringInString(
kRequestXml,
- "<event eventtype=\"3\" eventresult=\"0\" errorcode=\"60\"></event>"))
+ "<event eventtype=\"3\" eventresult=\"0\" errorcode=\"62\"></event>"))
<< kRequestXml;
}
@@ -399,7 +399,7 @@
2,
CountSubstringInString(
kRequestXml,
- "<event eventtype=\"3\" eventresult=\"0\" errorcode=\"60\"></event>"))
+ "<event eventtype=\"3\" eventresult=\"0\" errorcode=\"62\"></event>"))
<< kRequestXml;
}
} // namespace chromeos_update_engine