commit 056b0abc1273a6eebfd73060a1d0344ef02b8696
author J. Richard Barnette <jrbarnette@chromium.org> Tue Oct 29 15:24:56 2013 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Wed Oct 30 21:52:04 2013 +0000
tree ac9a854d749150507eb20f14bbda339083f76b41
parent 522d36ffca22b8c218cdc6a2d1dbab40f6d9b215

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>

payload_state.cc

diff --git a/payload_state.cc b/payload_state.cc
index 9839a2b..a23b545 100644
--- a/payload_state.cc
+++ b/payload_state.cc
@@ -317,7 +317,7 @@
     return false;
   }
 
-  if (!utils::IsOfficialBuild()) {
+  if (!system_state_->hardware()->IsOfficialBuild()) {
     // Backoffs are needed only for official builds. We do not want any delays
     // or update failures due to backoffs during testing or development.
     LOG(INFO) << "No backoffs for test/dev images. "
@@ -1091,7 +1091,7 @@
 void PayloadState::ComputeCandidateUrls() {
   bool http_url_ok = true;
 
-  if (system_state_->IsOfficialBuild()) {
+  if (system_state_->hardware()->IsOfficialBuild()) {
     const policy::DevicePolicy* policy = system_state_->device_policy();
     if (policy && policy->GetHttpDownloadsEnabled(&http_url_ok) && !http_url_ok)
       LOG(INFO) << "Downloads via HTTP Url are not enabled by device policy";