Fix the broken XML parser due to version mismatch.

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 14 matching lines @@
 #include "base/sys_info.h"
 #include "build/build_config.h"
 #include "components/crx_file/id_util.h"
 #include "components/data_use_measurement/core/data_use_user_data.h"
 #include "components/update_client/component.h"
 #include "components/update_client/configurator.h"
 #include "components/update_client/crx_update_item.h"
 #include "components/update_client/update_client.h"
 #include "components/update_client/update_client_errors.h"
 #include "components/update_client/update_query_params.h"
+#include "components/update_client/update_response.h"
 #include "components/update_client/updater_state.h"
 #include "crypto/secure_hash.h"
 #include "crypto/sha2.h"
 #include "net/base/load_flags.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "net/url_request/url_request_status.h"
 #include "url/gurl.h"
 
 #if defined(OS_WIN)
@@ skipping 43 matching lines @@
 std::string GetServicePack() {
 #if defined(OS_WIN)
   return base::win::OSInfo::GetInstance()->service_pack_str();
 #else
   return std::string();
 #endif
 }
 
 }  // namespace
 
-// Builds a protocol message. The protocol versions so far are:
-// * Version 3.1: it changes how the run actions are serialized.
-// * Version 3.0: it is the version implemented by the desktop updaters.
+// Builds a protocol message.
 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::unique_ptr<UpdaterState::Attributes>& updater_state_attributes) {
-  std::string request(
+  std::string request = base::StringPrintf(
       "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
-      "<request protocol=\"3.1\" ");
+      "<request protocol=\"%s\" ",
+      kProtocolVersion);
 
   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\"",
@@ skipping 220 matching lines @@
                   [](const GURL& url) { return !url.SchemeIsCryptographic(); }),
               urls->end());
 }
 
 CrxInstaller::Result InstallFunctionWrapper(base::Callback<bool()> callback) {
   return CrxInstaller::Result(callback.Run() ? InstallError::NONE
                                              : InstallError::GENERIC_ERROR);
 }
 
 }  // namespace update_client