Inject the prodid for the extensions and component updaters.

components/update_client/utils.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/update_client/utils.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 50 matching lines @@
     }
   }
 
   DCHECK(crx_file::id_util::IdIsValid(id));
 
   return id;
 }
 
 }  // namespace
 
-std::string BuildProtocolRequest(const std::string& browser_version,
+std::string BuildProtocolRequest(const std::string& prod_id,
+                                 const std::string& browser_version,
                                  const std::string& channel,
                                  const std::string& lang,
                                  const std::string& os_long_name,
                                  const std::string& download_preference,
                                  const std::string& request_body,
                                  const std::string& additional_attributes) {
-  const std::string prod_id(
-      UpdateQueryParams::GetProdIdString(UpdateQueryParams::CHROME));
-
   std::string request(
       "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
       "<request protocol=\"3.0\" ");
 
   if (!additional_attributes.empty())
     base::StringAppendF(&request, "%s ", additional_attributes.c_str());
 
   // Chrome version and platform information.
   base::StringAppendF(
       &request,
       "version=\"%s-%s\" prodversion=\"%s\" "
       "requestid=\"{%s}\" lang=\"%s\" updaterchannel=\"%s\" prodchannel=\"%s\" "
       "os=\"%s\" arch=\"%s\" nacl_arch=\"%s\"",
-      prod_id.c_str(),
-      browser_version.c_str(),            // "version"
+      prod_id.c_str(),                    // "version" is prefixed by prod_id.
+      browser_version.c_str(),
       browser_version.c_str(),            // "prodversion"
       base::GenerateGUID().c_str(),       // "requestid"
       lang.c_str(),                       // "lang",
       channel.c_str(),                    // "updaterchannel"
       channel.c_str(),                    // "prodchannel"
       UpdateQueryParams::GetOS(),         // "os"
       UpdateQueryParams::GetArch(),       // "arch"
       UpdateQueryParams::GetNaclArch());  // "nacl_arch"
 #if defined(OS_WIN)
   const bool is_wow64(base::win::OSInfo::GetInstance()->wow64_status() ==
@@ skipping 173 matching lines @@
 
 void RemoveUnsecureUrls(std::vector<GURL>* urls) {
   DCHECK(urls);
   urls->erase(std::remove_if(
                   urls->begin(), urls->end(),
                   [](const GURL& url) { return !url.SchemeIsCryptographic(); }),
               urls->end());
 }
 
 }  // namespace update_client