commit 28d6be6ba06170dc99b2b9fd1685a7a6405abc1a
author Gilad Arnold <garnold@chromium.org> Mon Jun 30 14:04:04 2014 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Thu Jul 10 21:16:29 2014 +0000
tree dc5f0f2a2d4c93dee5b335f1445af479e60f07c7
parent 42f253b5318dbe6d0ecf48f7f9a639363fa253e2

UpdateManager: UpdateCurrentConnectionAllowed should return kAskMeAgainLater.

This reflects the fact that the restriction is temporary, and that the
update process should not be terminated, therefore is more correct than
returning kFailed.

This also relocates the code that allows user settings to enable update
over a cellular connection, in cases where a policy is active but does
not specify allowed connections.

BUG=chromium:390264
TEST=Unit tests.

Change-Id: Iadfd05ba3c4617a22c69b82232b7802d1ea65504
Reviewed-on: https://chromium-review.googlesource.com/206144
Tested-by: Gilad Arnold <garnold@chromium.org>
Reviewed-by: Gilad Arnold <garnold@chromium.org>
Commit-Queue: Gilad Arnold <garnold@chromium.org>

update_manager/chromeos_policy_unittest.cc

diff --git a/update_manager/chromeos_policy_unittest.cc b/update_manager/chromeos_policy_unittest.cc
index eef2250..2eba5d2 100644
--- a/update_manager/chromeos_policy_unittest.cc
+++ b/update_manager/chromeos_policy_unittest.cc
@@ -741,9 +741,8 @@
       reset(new ConnectionTethering(ConnectionTethering::kConfirmed));
 
   bool result;
-  ExpectPolicyStatus(EvalStatus::kSucceeded,
+  ExpectPolicyStatus(EvalStatus::kAskMeAgainLater,
                      &Policy::UpdateDownloadAllowed, &result);
-  EXPECT_FALSE(result);
 }
 
 TEST_F(UmChromeOSPolicyTest,
@@ -786,9 +785,8 @@
       reset(new ConnectionType(ConnectionType::kBluetooth));
 
   bool result;
-  ExpectPolicyStatus(EvalStatus::kSucceeded,
+  ExpectPolicyStatus(EvalStatus::kAskMeAgainLater,
                      &Policy::UpdateDownloadAllowed, &result);
-  EXPECT_FALSE(result);
 }
 
 TEST_F(UmChromeOSPolicyTest,
@@ -804,9 +802,8 @@
       reset(new set<ConnectionType>(allowed_connections));
 
   bool result;
-  ExpectPolicyStatus(EvalStatus::kSucceeded,
+  ExpectPolicyStatus(EvalStatus::kAskMeAgainLater,
                      &Policy::UpdateDownloadAllowed, &result);
-  EXPECT_FALSE(result);
 }
 
 TEST_F(UmChromeOSPolicyTest, UpdateCurrentConnectionNotAllowedCellularDefault) {
@@ -816,9 +813,8 @@
       reset(new ConnectionType(ConnectionType::kCellular));
 
   bool result;
-  ExpectPolicyStatus(EvalStatus::kSucceeded,
+  ExpectPolicyStatus(EvalStatus::kAskMeAgainLater,
                      &Policy::UpdateDownloadAllowed, &result);
-  EXPECT_FALSE(result);
 }
 
 TEST_F(UmChromeOSPolicyTest,