Refactor how the updater state data is serialized in update checks.

components/update_client/utils.h

 // 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.
 
 #ifndef COMPONENTS_UPDATE_CLIENT_UTILS_H_
 #define COMPONENTS_UPDATE_CLIENT_UTILS_H_
 
 #include <memory>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/callback_forward.h"
 #include "components/update_client/update_client.h"
+#include "components/update_client/updater_state.h"
 
 class GURL;
 
 namespace base {
 class DictionaryValue;
 class FilePath;
 }
 
 namespace net {
 class URLFetcher;
@@ skipping 26 matching lines @@
 //   <os platform="win" version="6.1" arch="x86"/>
 //   ... REQUEST BODY ...
 // </request>
 
 // Builds a protocol request string by creating the outer envelope for
 // the request and including the request body specified as a parameter.
 // If present, the |download_preference| specifies a group policy that
 // affects the list of download URLs returned in the update response.
 // If specified, |additional_attributes| are appended as attributes of the
 // request element. The additional attributes have to be well-formed for
-// insertion in the request element.
-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);
+// insertion in the request element. |updater_state_attributes| is an optional
+// parameter specifying that an <updater> element is serialized as part of
+// the request.
+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);
 
 // Sends a protocol request to the the service endpoint specified by |url|.
 // The body of the request is provided by |protocol_request| and it is
 // expected to contain XML data. The caller owns the returned object.
 std::unique_ptr<net::URLFetcher> SendProtocolRequest(
     const GURL& url,
     const std::string& protocol_request,
     net::URLFetcherDelegate* url_fetcher_delegate,
     net::URLRequestContextGetter* url_request_context_getter);
 
@@ skipping 37 matching lines @@
 // Removes the unsecure urls in the |urls| parameter.
 void RemoveUnsecureUrls(std::vector<GURL>* urls);
 
 // Adapter function for the old definitions of CrxInstaller::Install until the
 // component installer code is migrated to use a REsult instead of bool.
 CrxInstaller::Result InstallFunctionWrapper(base::Callback<bool()> callback);
 
 }  // namespace update_client
 
 #endif  // COMPONENTS_UPDATE_CLIENT_UTILS_H_