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

chrome/browser/component_updater/pnacl/pnacl_component_installer.h

Index: chrome/browser/component_updater/pnacl/pnacl_component_installer.h
diff --git a/chrome/browser/component_updater/pnacl/pnacl_component_installer.h b/chrome/browser/component_updater/pnacl/pnacl_component_installer.h
index 88fb61fb823b7290114296b8d4f1524afaf40b9e..1b2578bf28eec7dfdcabd1df546fe4574d034584 100644
--- a/chrome/browser/component_updater/pnacl/pnacl_component_installer.h
+++ b/chrome/browser/component_updater/pnacl/pnacl_component_installer.h
@@ -47,6 +47,8 @@ class PnaclComponentInstaller : public ComponentInstaller {
   // updater service.
   void ReRegisterPnacl();
 
+  CrxComponent GetCrxComponent() const;
+
   // Return true if PNaCl installs are separated by user.
   bool per_user() const { return per_user_; }
 
@@ -84,10 +86,8 @@ class PnaclComponentInstaller : public ComponentInstaller {
   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_;