Omaha: Send updater version and channel in the request.

This data is already in <app>, but by duplicating it into <request>,
Omaha's cross-product server-side monitoring and logging infra will
track QPS from this updater by version / channel.

Bug: 1110339
Fixed: 1110339
Change-Id: I4e85eaad3f1cfffe63f6a9d6319cad8042a6bff3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2418912
Auto-Submit: Joshua Pawlicki <waffles@chromium.org>
Reviewed-by: Rohit Rao <rohitrao@chromium.org>
Commit-Queue: Joshua Pawlicki <waffles@chromium.org>
Cr-Commit-Position: refs/heads/master@{#813326}

ios/chrome/browser/omaha/omaha_service.mm

@@ -513,7 +513,9 @@ std::string OmahaService::GetPingContent(const std::string& requestId,
   XmlWrapper xml_wrapper;
   xml_wrapper.StartElement("request");
   xml_wrapper.WriteAttribute("protocol", "3.0");
-  xml_wrapper.WriteAttribute("version", "iOS-1.0.0.0");
+  xml_wrapper.WriteAttribute("updater", "iOS");
+  xml_wrapper.WriteAttribute("updaterversion", versionName.c_str());
+  xml_wrapper.WriteAttribute("updaterchannel", channelName.c_str());
   xml_wrapper.WriteAttribute("ismachine", "1");
   xml_wrapper.WriteAttribute("requestid", requestId.c_str());
   xml_wrapper.WriteAttribute("sessionid", sessionId.c_str());

ios/chrome/browser/omaha/omaha_service_unittest.mm

@@ -131,9 +131,9 @@ class OmahaServiceTest : public PlatformTest {
 
 TEST_F(OmahaServiceTest, PingMessageTest) {
   const char* expectedResult =
-      "<request protocol=\"3.0\" version=\"iOS-1.0.0.0\" ismachine=\"1\" "
-      "requestid=\"requestId\" sessionid=\"sessionId\""
-      " hardware_class=\"[^\"]*\">"
+      "<request protocol=\"3.0\" updater=\"iOS\" updaterversion=\"[^\"]*\""
+      " updaterchannel=\"[^\"]*\" ismachine=\"1\" requestid=\"requestId\""
+      " sessionid=\"sessionId\" hardware_class=\"[^\"]*\">"
       "<os platform=\"ios\" version=\"[0-9][0-9]*\\(\\.[0-9][0-9]*\\)*\""
       " arch=\"[^\"]*\"/>"
       "<app version=\"[^\"]*\" nextversion=\"\" lang=\"[^\"]*\""
@@ -154,15 +154,15 @@ TEST_F(OmahaServiceTest, PingMessageTest) {
   regcomp(&regex, expectedResult, REG_NOSUB);
   int result = regexec(&regex, content.c_str(), 0, NULL, 0);
   regfree(&regex);
-  EXPECT_EQ(0, result);
+  EXPECT_EQ(0, result) << "Actual contents: " << content;
   EXPECT_FALSE(NeedUpdate());
 }
 
 TEST_F(OmahaServiceTest, PingMessageTestWithUnknownInstallDate) {
   const char* expectedResult =
-      "<request protocol=\"3.0\" version=\"iOS-1.0.0.0\" ismachine=\"1\" "
-      "requestid=\"requestId\" sessionid=\"sessionId\""
-      " hardware_class=\"[^\"]*\">"
+      "<request protocol=\"3.0\" updater=\"iOS\" updaterversion=\"[^\"]*\""
+      " updaterchannel=\"[^\"]*\" ismachine=\"1\" requestid=\"requestId\""
+      " sessionid=\"sessionId\" hardware_class=\"[^\"]*\">"
       "<os platform=\"ios\" version=\"[0-9][0-9]*\\(\\.[0-9][0-9]*\\)*\""
       " arch=\"[^\"]*\"/>"
       "<app version=\"[^\"]*\" nextversion=\"\" lang=\"[^\"]*\""
@@ -184,15 +184,15 @@ TEST_F(OmahaServiceTest, PingMessageTestWithUnknownInstallDate) {
   regcomp(&regex, expectedResult, REG_NOSUB);
   int result = regexec(&regex, content.c_str(), 0, NULL, 0);
   regfree(&regex);
-  EXPECT_EQ(0, result);
+  EXPECT_EQ(0, result) << "Actual contents: " << content;
   EXPECT_FALSE(NeedUpdate());
 }
 
 TEST_F(OmahaServiceTest, InstallEventMessageTest) {
   const char* kExpectedResultFormat =
-      "<request protocol=\"3.0\" version=\"iOS-1.0.0.0\" ismachine=\"1\" "
-      "requestid=\"requestId\" sessionid=\"sessionId\""
-      " hardware_class=\"[^\"]*\">"
+      "<request protocol=\"3.0\" updater=\"iOS\" updaterversion=\"[^\"]*\""
+      " updaterchannel=\"[^\"]*\" ismachine=\"1\" requestid=\"requestId\""
+      " sessionid=\"sessionId\" hardware_class=\"[^\"]*\">"
       "<os platform=\"ios\" version=\"[0-9][0-9]*(\\.[0-9][0-9]*)*\""
       " arch=\"[^\"]*\"/>"
       "<app version=\"%s\" nextversion=\"[^\"]*\" lang=\"[^\"]*\""
@@ -478,9 +478,9 @@ TEST_F(OmahaServiceTest, ParseAndEchoLastServerDate) {
   EXPECT_EQ(4088, service.last_server_date_);
 
   const char* expectedResult =
-      "<request protocol=\"3.0\" version=\"iOS-1.0.0.0\" ismachine=\"1\" "
-      "requestid=\"requestId\" sessionid=\"sessionId\""
-      " hardware_class=\"[^\"]*\">"
+      "<request protocol=\"3.0\" updater=\"iOS\" updaterversion=\"[^\"]*\""
+      " updaterchannel=\"[^\"]*\" ismachine=\"1\" requestid=\"requestId\""
+      " sessionid=\"sessionId\" hardware_class=\"[^\"]*\">"
       "<os platform=\"ios\" version=\"[0-9][0-9]*\\(\\.[0-9][0-9]*\\)*\""
       " arch=\"[^\"]*\"/>"
       "<app version=\"[^\"]*\" nextversion=\"\" lang=\"[^\"]*\""
@@ -497,7 +497,7 @@ TEST_F(OmahaServiceTest, ParseAndEchoLastServerDate) {
   regcomp(&regex, expectedResult, REG_NOSUB);
   int result = regexec(&regex, content.c_str(), 0, nullptr, 0);
   regfree(&regex);
-  EXPECT_EQ(0, result);
+  EXPECT_EQ(0, result) << "Actual contents: " << content;
 }
 
 TEST_F(OmahaServiceTest, SendInstallEventSuccess) {