Enable forced extension updates on NaCl arch mismatch

chrome/browser/extensions/updater/manifest_fetch_data.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 "chrome/browser/extensions/updater/manifest_fetch_data.h"
 
 #include <vector>
 
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
@@ skipping 49 matching lines @@
 //   Extension 2- id:bbbb version:2.0
 //
 // the full update url would be:
 //   http://somehost/path?x=id%3Daaaa%26v%3D1.1%26uc&x=id%3Dbbbb%26v%3D2.0%26uc
 //
 // (Note that '=' is %3D and '&' is %26 when urlencoded.)
 bool ManifestFetchData::AddExtension(const std::string& id,
                                      const std::string& version,
                                      const PingData* ping_data,
                                      const std::string& update_url_data,
-                                     const std::string& install_source) {
+                                     const std::string& install_source,
+                                     bool force_update) {
   if (extension_ids_.find(id) != extension_ids_.end()) {
     NOTREACHED() << "Duplicate extension id " << id;
     return false;
   }
 
+  if (force_update) {

[Yoyo Zhou, 2014/09/02 19:30:04]

nit: no braces

[Ken Rockot(use gerrit already), 2014/09/02 20:04:30]

Done.

+    forced_updates_.insert(id);
+  }
+
+  // If we want to force an update, we send 0.0.0.0 as the installed version
+  // number.
+  std::string installed_version = force_update ? "0.0.0.0" : version;

[Sorin Jianu, 2014/09/02 20:06:39]

could be made const.

[Ken Rockot(use gerrit already), 2014/09/02 20:19:20]

Done.

+
   // Compute the string we'd append onto the full_url_, and see if it fits.
   std::vector<std::string> parts;
   parts.push_back("id=" + id);
-  parts.push_back("v=" + version);
+  parts.push_back("v=" + installed_version);
   if (!install_source.empty())
     parts.push_back("installsource=" + install_source);
   parts.push_back("uc");
 
   if (!update_url_data.empty()) {
     // Make sure the update_url_data string is escaped before using it so that
     // there is no chance of overriding the id or v other parameter value
     // we place into the x= value.
     parts.push_back("ap=" + net::EscapeQueryParamValue(update_url_data, true));
   }
@@ skipping 66 matching lines @@
   else
     NOTREACHED();
   return value == kNeverPinged || value > 0;
 }
 
 void ManifestFetchData::Merge(const ManifestFetchData& other) {
   DCHECK(full_url() == other.full_url());
   request_ids_.insert(other.request_ids_.begin(), other.request_ids_.end());
 }
 
+bool ManifestFetchData::DidForceUpdate(const std::string& extension_id) const {
+  return forced_updates_.find(extension_id) != forced_updates_.end();
+}
+
 }  // namespace extensions