Consistently use notifications from component updater w/ on-demand PNaCl.

chrome/browser/component_updater/pnacl/pnacl_component_installer.h

 // 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.
 
 #ifndef CHROME_BROWSER_COMPONENT_UPDATER_PNACL_PNACL_COMPONENT_INSTALLER_H_
 #define CHROME_BROWSER_COMPONENT_UPDATER_PNACL_PNACL_COMPONENT_INSTALLER_H_
 
 #include <list>
 
 #include "base/callback_forward.h"
@@ skipping 29 matching lines @@
                                 base::FilePath* installed_file) OVERRIDE;
 
   // Register a PNaCl component for the first time.
   void RegisterPnaclComponent(ComponentUpdateService* cus,
                               const CommandLine& command_line);
 
   // Check the PNaCl version again and re-register with the component
   // updater service.
   void ReRegisterPnacl();
 
+  CrxComponent GetCrxComponent();

[Sorin Jianu, 2013/07/03 21:17:32]

could declare the function const.

[jvoung (off chromium), 2013/07/03 22:51:51]

Done.  It does introduce a const-cast when taking a pointer to "this" though
(see the .cc file).

+
   // Return true if PNaCl installs are separated by user.
   bool per_user() const { return per_user_; }
 
   // If per_user, function to call when profile is changed.
   void OnProfileChange();
 
   // Return true if PNaCl updates are disabled.
   bool updates_disabled() const { return updates_disabled_; }
 
   // Determine the base directory for storing each version of PNaCl.
@@ skipping 17 matching lines @@
   void CancelCallback(int callback_num);
 
   void NotifyAllWithResult(bool status);
 
   bool per_user_;
   bool updates_disabled_;
   scoped_ptr<PnaclProfileObserver> profile_observer_;
   base::FilePath current_profile_path_;
   base::Version current_version_;
   ComponentUpdateService* cus_;
-  // Counter to issue identifiers to each callback.
-  int callback_nums_;
   // List of callbacks to issue when an install completes successfully.
-  std::list<std::pair<InstallCallback, int> > install_callbacks_;
+  std::list<InstallCallback> install_callbacks_;
   // Component updater service observer, to determine when an on-demand
   // install request failed.
   scoped_ptr<PnaclUpdaterObserver> updater_observer_;
   DISALLOW_COPY_AND_ASSIGN(PnaclComponentInstaller);
 };
 
 // Returns true if this browser is compatible with the given Pnacl component
 // manifest, with the version specified in the manifest in |version_out|.
 bool CheckPnaclComponentManifest(const base::DictionaryValue& manifest,
                                  base::Version* version_out);
 
 // Ask the given component updater service to do a first-install for PNaCl.
 // The |installed| callback will be run with |true| on success,
 // or run with |false| on an error. The callback is called on the UI thread.
 void RequestFirstInstall(ComponentUpdateService* cus,
                          PnaclComponentInstaller* pci,
                          const base::Callback<void(bool)>& installed);
 
 #endif  // CHROME_BROWSER_COMPONENT_UPDATER_PNACL_PNACL_COMPONENT_INSTALLER_H_