Component updater: send extra attributes in the request to

chrome/browser/component_updater/component_updater_service.cc

 // Copyright (c) 2011 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 "chrome/browser/component_updater/component_updater_service.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/at_exit.h"
@@ skipping 22 matching lines @@
 namespace {
 // Extends an omaha compatible update check url |query| string. Does
 // not mutate the string if it would be longer than |limit| chars.
 bool AddQueryString(std::string id, std::string version,
                     size_t limit, std::string* query) {
   std::string additional =
       base::StringPrintf("id=%s&v=%s&uc", id.c_str(), version.c_str());
   additional = "x=" + net::EscapeQueryParamValue(additional, true);
   if ((additional.size() + query->size() + 1) > limit)
     return false;
-  query->append(1,  query->empty()? '?' : '&');
+  if (!query->empty())
+    query->append(1, '&');
   query->append(additional);
   return true;
 }
 
+// Create the final omaha compatible query. The |extra| is optional and can
+// be null. It should contain top level (non-escaped) parameters.
+std::string MakeFinalQuery(const std::string& host,
+                           const std::string& query,
+                           const char* extra) {
+  std::string request(host);
+  request.append(1, '?');
+  if (extra) {
+    request.append(extra);
+    request.append(1, '&');
+  }
+  request.append(query);
+  return request;
+}
+
 // Produces an extension-like friendly |id|. This might be removed in the
 // future if we roll our on packing tools.
 static std::string HexStringToID(const std::string& hexstr) {
   std::string id;
   for (size_t i = 0; i < hexstr.size(); ++i) {
     int val;
     if (base::HexStringToInt(hexstr.begin() + i, hexstr.begin() + i + 1, &val))
       id.append(1, val + 'a');
     else
       id.append(1, 'a');
@@ skipping 465 matching lines @@
       break;
   }
 
   if (query.empty()) {
     // Next check after the long sleep.
     ScheduleNextRun(false);
     return;
   }
 
   // We got components to check. Start the url request.
-  GURL url(config_->UpdateUrl().spec() + query);
-  url_fetcher_.reset(URLFetcher::Create(0, url, URLFetcher::GET,
+  const std::string full_query = MakeFinalQuery(config_->UpdateUrl().spec(),
+                                                query,
+                                                config_->ExtraRequestParams());
+  url_fetcher_.reset(URLFetcher::Create(0, GURL(full_query), URLFetcher::GET,
       MakeContextDelegate(this, new UpdateContext())));
   StartFetch(url_fetcher_.get(), config_->RequestContext(), false);
 }
 
 // Caled when we got a response from the update server. It consists of an xml
 // document following the omaha update scheme.
 void CrxUpdateService::OnURLFetchComplete(const URLFetcher* source,
                                           UpdateContext* context) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (FetchSuccess(*source)) {
@@ skipping 180 matching lines @@
   ScheduleNextRun(false);
 }
 
 // The component update factory. Using the component updater as a singleton
 // is the job of the browser process.
 ComponentUpdateService* ComponentUpdateServiceFactory(
     ComponentUpdateService::Configurator* config) {
   DCHECK(config);
   return new CrxUpdateService(config);
 }