Enable forced extension updates on NaCl arch mismatch

chrome/browser/extensions/updater/manifest_fetch_data.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 CHROME_BROWSER_EXTENSIONS_UPDATER_MANIFEST_FETCH_DATA_H_
 #define CHROME_BROWSER_EXTENSIONS_UPDATER_MANIFEST_FETCH_DATA_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 38 matching lines @@
   ManifestFetchData(const GURL& update_url, int request_id);
   ~ManifestFetchData();
 
   // Returns true if this extension information was successfully added. If the
   // return value is false it means the full_url would have become too long, and
   // this ManifestFetchData object remains unchanged.
   bool 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);
 
   const GURL& base_url() const { return base_url_; }
   const GURL& full_url() const { return full_url_; }
   const std::set<std::string>& extension_ids() const { return extension_ids_; }
   const std::set<int>& request_ids() const { return request_ids_; }
 
   // Returns true if the given id is included in this manifest fetch.
   bool Includes(const std::string& extension_id) const;
 
   // Returns true if a ping parameter for |type| was added to full_url for this
   // extension id.
   bool DidPing(const std::string& extension_id, PingType type) const;
 
   // Assuming that both this ManifestFetchData and |other| have the same
   // full_url, this method merges the other information associated with the
   // fetch (in particular this adds all request ids associated with |other|
   // to this ManifestFetchData).
   void Merge(const ManifestFetchData& other);
 
+  // Indiciates whether or not a given extension ID was forced to update.

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

Indicates.

Or rephrase to "Returns true if a given ext...."

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

Done.

+  bool DidForceUpdate(const std::string& extension_id) const;
+
  private:
   // The set of extension id's for this ManifestFetchData.
   std::set<std::string> extension_ids_;
 
   // The set of ping data we actually sent.
   std::map<std::string, PingData> pings_;
 
   // The base update url without any arguments added.
   GURL base_url_;
 
   // The base update url plus arguments indicating the id, version, etc.
   // information about each extension.
   GURL full_url_;
 
   // The set of request ids associated with this manifest fetch. If multiple
   // requests are trying to fetch the same manifest, they can be merged into
   // one fetch, so potentially multiple request ids can get associated with
   // one ManifestFetchData.
   std::set<int> request_ids_;
 

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

Comment? The other private members have comments.

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

Done.

+  std::set<std::string> forced_updates_;
+
   DISALLOW_COPY_AND_ASSIGN(ManifestFetchData);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_UPDATER_MANIFEST_FETCH_DATA_H_