commit 3b74843840fda8e6954986bdd6a9fccc835d5580
author Chris Sosa <sosa@chromium.org> Thu Jun 20 16:42:59 2013 -0700
committer Chris Sosa <sosa@chromium.org> Sat Jun 22 21:52:32 2013 -0700
tree 6768392161f6360321edb66debebdc6583ba7cd4
parent 1ed607829ead4276891a678477d32901c491fbae

Parse and add manifest version to the Omaha Response object.

This CL adds the version of the update we're updating to to the Omaha
response object and removes the use of DisplayVersion. DisplayVersion is
from the Omaha Protocol v1, and v2 and has never been used or relied
upon in the update engine.

Protocol is described here:
https://code.google.com/p/omaha/wiki/ServerProtocol

Manifest version should always describe the version of the application we are
updating to as is described by the manifest.

BUG=chromium:252527
TEST=Unittests + devserver image_to_live test.

Change-Id: I9afaa8af3c21813f19d88abf437f35b024d31985
Reviewed-on: https://gerrit.chromium.org/gerrit/59498
Reviewed-by: Chris Sosa <sosa@chromium.org>
Tested-by: Chris Sosa <sosa@chromium.org>
Commit-Queue: Chris Sosa <sosa@chromium.org>

omaha_request_action_unittest.cc

diff --git a/omaha_request_action_unittest.cc b/omaha_request_action_unittest.cc
index de5f49f..6051f01 100644
--- a/omaha_request_action_unittest.cc
+++ b/omaha_request_action_unittest.cc
@@ -70,7 +70,7 @@
 }
 
 string GetUpdateResponse2(const string& app_id,
-                          const string& display_version,
+                          const string& version,
                           const string& more_info_url,
                           const string& prompt,
                           const string& codebase,
@@ -87,12 +87,11 @@
       "<app appid=\"" + app_id + "\" status=\"ok\">"
       "<ping status=\"ok\"/><updatecheck status=\"ok\">"
       "<urls><url codebase=\"" + codebase + "\"/></urls>"
-      "<manifest version=\"" + display_version + "\">"
+      "<manifest version=\"" + version + "\">"
       "<packages><package hash=\"not-used\" name=\"" + filename +  "\" "
       "size=\"" + size + "\"/></packages>"
       "<actions><action event=\"postinstall\" "
-      "DisplayVersion=\"" + display_version + "\" "
-      "ChromeOSVersion=\"" + display_version + "\" "
+      "ChromeOSVersion=\"" + version + "\" "
       "MoreInfo=\"" + more_info_url + "\" Prompt=\"" + prompt + "\" "
       "IsDelta=\"true\" "
       "IsDeltaPayload=\"true\" "
@@ -106,7 +105,7 @@
 }
 
 string GetUpdateResponse(const string& app_id,
-                         const string& display_version,
+                         const string& version,
                          const string& more_info_url,
                          const string& prompt,
                          const string& codebase,
@@ -116,7 +115,7 @@
                          const string& size,
                          const string& deadline) {
   return GetUpdateResponse2(app_id,
-                            display_version,
+                            version,
                             more_info_url,
                             prompt,
                             codebase,
@@ -309,7 +308,7 @@
                       NULL));
   EXPECT_TRUE(response.update_exists);
   EXPECT_TRUE(response.update_exists);
-  EXPECT_EQ("1.2.3.4", response.display_version);
+  EXPECT_EQ("1.2.3.4", response.version);
   EXPECT_EQ("http://code/base/file.signed", response.payload_urls[0]);
   EXPECT_EQ("http://more/info", response.more_info_url);
   EXPECT_EQ("HASH1234=", response.hash);
@@ -733,11 +732,10 @@
       "<app appid=\"xyz\" status=\"ok\">"
       "<updatecheck status=\"ok\">"
       "<urls><url codebase=\"http://missing/field/test/\"/></urls>"
-      "<manifest version=\"1.0.0.0\">"
+      "<manifest version=\"10.2.3.4\">"
       "<packages><package hash=\"not-used\" name=\"f\" "
       "size=\"587\"/></packages>"
       "<actions><action event=\"postinstall\" "
-      "DisplayVersion=\"10.2.3.4\" "
       "ChromeOSVersion=\"10.2.3.4\" "
       "Prompt=\"false\" "
       "IsDelta=\"true\" "
@@ -757,7 +755,7 @@
                               &response,
                               NULL));
   EXPECT_TRUE(response.update_exists);
-  EXPECT_EQ("10.2.3.4", response.display_version);
+  EXPECT_EQ("10.2.3.4", response.version);
   EXPECT_EQ("http://missing/field/test/f", response.payload_urls[0]);
   EXPECT_EQ("", response.more_info_url);
   EXPECT_EQ("lkq34j5345", response.hash);