commit c0e8f9acecf3c8919035961a1b44f3de1937deed
author Xiyuan Xia <xiyuan@google.com> Wed Feb 22 13:19:35 2017 -0800
committer Sen Jiang <senj@google.com> Wed May 31 15:56:02 2017 -0700
tree e670f25aa5c033ec801b4246b747beb68546fd7b
parent 067053eea5711adb79307f290f05fd0a876be0eb

Always update target version prefix

When UpdateAttempter::Update is called, the cached target version
prefix in its |omaha_request_params_| should always be updated with
the one passed in.

Also fix the target version LOG lines in kiosk app pin policy code.

BUG=chromium:695133
TEST=UpdateAttempterTest.TargetVersionPrefixSetAndReset

Reviewed-on: https://chromium-review.googlesource.com/446657
Commit-Ready: Xiyuan Xia <xiyuan@chromium.org>
Tested-by: Xiyuan Xia <xiyuan@chromium.org>
Reviewed-by: Alex Deymo <deymo@chromium.org>
Reviewed-by: Ben Chan <benchan@chromium.org>

(cherry picked from commit 4d34c18e5ce29d138c7946cc817dee8b3fce7cf0)

Change-Id: I712b169505f4566aac3a0b2c9746dfcb9466ef8d

update_attempter.cc

diff --git a/update_attempter.cc b/update_attempter.cc
index 1bdd0eb..d9a8d04 100644
--- a/update_attempter.cc
+++ b/update_attempter.cc
@@ -371,9 +371,8 @@
   // Refresh the policy before computing all the update parameters.
   RefreshDevicePolicy();
 
-  // Set the target version prefix, if provided.
-  if (!target_version_prefix.empty())
-    omaha_request_params_->set_target_version_prefix(target_version_prefix);
+  // Update the target version prefix.
+  omaha_request_params_->set_target_version_prefix(target_version_prefix);
 
   CalculateScatteringParams(interactive);
 

update_attempter.h

diff --git a/update_attempter.h b/update_attempter.h
index f6547fe..c88e7ad 100644
--- a/update_attempter.h
+++ b/update_attempter.h
@@ -256,6 +256,7 @@
   FRIEND_TEST(UpdateAttempterTest, UpdateTest);
   FRIEND_TEST(UpdateAttempterTest, ReportDailyMetrics);
   FRIEND_TEST(UpdateAttempterTest, BootTimeInUpdateMarkerFile);
+  FRIEND_TEST(UpdateAttempterTest, TargetVersionPrefixSetAndReset);
 
   // CertificateChecker::Observer method.
   // Report metrics about the certificate being checked.

update_attempter_unittest.cc

diff --git a/update_attempter_unittest.cc b/update_attempter_unittest.cc
index 94a1b3c..5224870 100644
--- a/update_attempter_unittest.cc
+++ b/update_attempter_unittest.cc
@@ -978,4 +978,14 @@
   EXPECT_EQ(constants::kOmahaDefaultAUTestURL, attempter_.forced_omaha_url());
 }
 
+TEST_F(UpdateAttempterTest, TargetVersionPrefixSetAndReset) {
+  attempter_.CalculateUpdateParams("", "", "", "1234", false, false);
+  EXPECT_EQ("1234",
+            fake_system_state_.request_params()->target_version_prefix());
+
+  attempter_.CalculateUpdateParams("", "", "", "", false, false);
+  EXPECT_TRUE(
+      fake_system_state_.request_params()->target_version_prefix().empty());
+}
+
 }  // namespace chromeos_update_engine

update_manager/chromeos_policy.cc

diff --git a/update_manager/chromeos_policy.cc b/update_manager/chromeos_policy.cc
index ec2b9f0..ffd378c 100644
--- a/update_manager/chromeos_policy.cc
+++ b/update_manager/chromeos_policy.cc
@@ -245,9 +245,9 @@
       }
 
       result->target_version_prefix = *kiosk_required_platform_version_p;
-      LOG(INFO) << "Allow kiosk app to control Chrome version policy is set,"
-                << ", target version is "
-                << (kiosk_required_platform_version_p
+      LOG(INFO) << "Allow kiosk app to control Chrome version policy is set, "
+                << "target version is "
+                << (!kiosk_required_platform_version_p->empty()
                         ? *kiosk_required_platform_version_p
                         : std::string("latest"));
     } else {