commit d4bc462dc64e6ca07958e84a1ebca5ff97dbea4b
author Marton Hunyady <hunyadym@chromium.org> Thu Aug 30 15:52:23 2018 +0200
committer chrome-bot <chrome-bot@chromium.org> Fri Aug 31 15:08:48 2018 -0700
tree 87c0324a520146d49ae15c46934562496b84ddb9
parent 31aefb9f77cb237594e7af599b32ec93df9f20fd

update_engine: Rename policy values of DeviceRollbackToTargetVersion

Rename the following values for better understanding and
consistency:
- RollbackWithFullPowerwash to RollbackAndPowerwash
- RollbackWithRestoreOnly to RollbackOnlyIfRestorePossible

BUG=chromium:878736
TEST='cros_run_unit_tests --board=caroline --packages update_engine'

Change-Id: Ib4129d2c297697e850d3027d35599fc37e104b0e
Reviewed-on: https://chromium-review.googlesource.com/1198533
Commit-Ready: Marton Hunyady <hunyadym@chromium.org>
Tested-by: Marton Hunyady <hunyadym@chromium.org>
Reviewed-by: Sen Jiang <senj@chromium.org>

update_manager/boxed_value_unittest.cc

diff --git a/update_manager/boxed_value_unittest.cc b/update_manager/boxed_value_unittest.cc
index b15a504..99d578c 100644
--- a/update_manager/boxed_value_unittest.cc
+++ b/update_manager/boxed_value_unittest.cc
@@ -203,19 +203,20 @@
             BoxedValue(
                 new RollbackToTargetVersion(RollbackToTargetVersion::kDisabled))
                 .ToString());
-  EXPECT_EQ("Rollback with full powerwash",
+  EXPECT_EQ("Rollback and powerwash",
             BoxedValue(new RollbackToTargetVersion(
-                           RollbackToTargetVersion::kRollbackWithFullPowerwash))
+                           RollbackToTargetVersion::kRollbackAndPowerwash))
                 .ToString());
   EXPECT_EQ(
       "Rollback and restore if possible",
       BoxedValue(new RollbackToTargetVersion(
                      RollbackToTargetVersion::kRollbackAndRestoreIfPossible))
           .ToString());
-  EXPECT_EQ("Rollback with restore only",
-            BoxedValue(new RollbackToTargetVersion(
-                           RollbackToTargetVersion::kRollbackWithRestoreOnly))
-                .ToString());
+  EXPECT_EQ(
+      "Rollback only if restore is possible",
+      BoxedValue(new RollbackToTargetVersion(
+                     RollbackToTargetVersion::kRollbackOnlyIfRestorePossible))
+          .ToString());
 }
 
 TEST(UmBoxedValueTest, SetConnectionTypeToString) {