Enable forced extension updates on NaCl arch mismatch.

chrome/browser/extensions/updater/extension_updater.h

 // Copyright (c) 2012 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_EXTENSION_UPDATER_H_
 #define CHROME_BROWSER_EXTENSIONS_UPDATER_EXTENSION_UPDATER_H_
 
 #include <list>
 #include <map>
 #include <set>
@@ skipping 139 matching lines @@
     ~InProgressCheck();
 
     bool install_immediately;
     FinishedCallback callback;
     // The ids of extensions that have in-progress update checks.
     std::list<std::string> in_progress_ids_;
   };
 
   struct ThrottleInfo;
 
+  // Callback used to continue CheckNow after determining which extensions
+  // should be force-updated.
+  void OnForcedUpdatesDetermined(const CheckParams& params,
+                                 const std::set<std::string>& forced_updates);
+
   // Ensure that we have a valid ExtensionDownloader instance referenced by
   // |downloader|.
   void EnsureDownloaderCreated();
 
   // Computes when to schedule the first update check.
   base::TimeDelta DetermineFirstCheckDelay();
 
   // Sets the timer to call TimerFired after roughly |target_delay| from now.
   // To help spread load evenly on servers, this method adds some random
   // jitter. It also saves the scheduled time so it can be reloaded on
@@ skipping 11 matching lines @@
 
   // Posted by CheckSoon().
   void DoCheckSoon();
 
   // Implementation of ExtensionDownloaderDelegate.
   virtual void OnExtensionDownloadFailed(
       const std::string& id,
       Error error,
       const PingResult& ping,
       const std::set<int>& request_ids) OVERRIDE;
-
   virtual void OnExtensionDownloadFinished(
       const std::string& id,
       const base::FilePath& path,
       bool file_ownership_passed,
       const GURL& download_url,
       const std::string& version,
       const PingResult& ping,
       const std::set<int>& request_id) OVERRIDE;
-
-  // Implementation of ExtensionRegistryObserver.
-  virtual void OnExtensionWillBeInstalled(
-      content::BrowserContext* browser_context,
-      const Extension* extension,
-      bool is_update,
-      bool from_ephemeral,
-      const std::string& old_name) OVERRIDE;
-
   virtual bool GetPingDataForExtension(
       const std::string& id,
       ManifestFetchData::PingData* ping_data) OVERRIDE;
-
   virtual std::string GetUpdateUrlData(const std::string& id) OVERRIDE;
-
   virtual bool IsExtensionPending(const std::string& id) OVERRIDE;
-
   virtual bool GetExtensionExistingVersion(const std::string& id,
                                            std::string* version) OVERRIDE;
+  virtual bool ShouldForceUpdate(const std::string& extension_id,
+                                 std::string* source) OVERRIDE;
 
   void UpdatePingData(const std::string& id, const PingResult& ping_result);
 
   // Starts installing a crx file that has been fetched but not installed yet.
   void MaybeInstallCRXFile();
 
   // content::NotificationObserver implementation.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
+  // Implementation of ExtensionRegistryObserver.
+  virtual void OnExtensionWillBeInstalled(
+      content::BrowserContext* browser_context,
+      const Extension* extension,
+      bool is_update,
+      bool from_ephemeral,
+      const std::string& old_name) OVERRIDE;
+
   // Send a notification that update checks are starting.
   void NotifyStarted();
 
   // Send a notification if we're finished updating.
   void NotifyIfFinished(int request_id);
 
   void ExtensionCheckFinished(const std::string& extension_id,
                               const FinishedCallback& callback);
 
   // Whether Start() has been called but not Stop().
@@ skipping 37 matching lines @@
   FetchedCRXFile current_crx_file_;
 
   CheckParams default_params_;
 
   ExtensionCache* extension_cache_;
 
   // Keeps track of when an extension tried to update itself, so we can throttle
   // checks to prevent too many requests from being made.
   std::map<std::string, ThrottleInfo> throttle_info_;
 
+  // Keeps track of extensions whose update should be forced during the next
+  // update check.

[Yoyo Zhou, 2014/09/04 22:41:26]

This comment should indicate that the set is of extension IDs.

[Ken Rockot(use gerrit already), 2014/09/05 01:41:34]

Done.

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