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

chrome/browser/component_updater/pnacl/pnacl_component_installer.cc

 // 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.
 
 #include "chrome/browser/component_updater/pnacl/pnacl_component_installer.h"
 
 #include "base/base_paths.h"
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
@@ skipping 173 matching lines @@
     return false;
   }
 
   *version_out = version;
   return true;
 }
 
 PnaclComponentInstaller::PnaclComponentInstaller()
     : per_user_(false),
       updates_disabled_(false),
-      cus_(NULL),
-      callback_nums_(0) {
+      cus_(NULL) {
 #if defined(OS_CHROMEOS)
   per_user_ = true;
 #endif
   updater_observer_.reset(new PnaclUpdaterObserver(this));
 }
 
 PnaclComponentInstaller::~PnaclComponentInstaller() {
 }
 
 void PnaclComponentInstaller::OnUpdateError(int error) {
@@ skipping 89 matching lines @@
     return false;
 
   *installed_file = GetPnaclBaseDirectory().AppendASCII(
       current_version().GetString()).AppendASCII(file);
   return true;
 }
 
 void PnaclComponentInstaller::AddInstallCallback(
     const InstallCallback& cb) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  int num = ++callback_nums_;
-  install_callbacks_.push_back(std::make_pair(cb, num));
-}
-
-void PnaclComponentInstaller::CancelCallback(int num) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  for (std::list<std::pair<InstallCallback, int> >::iterator
-           i = install_callbacks_.begin(),
-           e = install_callbacks_.end(); i != e; ++i) {
-    if (i->second == num) {
-      i->first.Run(false);
-      install_callbacks_.erase(i);
-      return;
-    }
-  }
+  updater_observer_->EnsureObserving();
+  install_callbacks_.push_back(cb);
 }
 
 void PnaclComponentInstaller::NotifyAllWithResult(bool status) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   while (!install_callbacks_.empty()) {
-    install_callbacks_.front().first.Run(status);
+    install_callbacks_.front().Run(status);
     install_callbacks_.pop_front();
   }
 }
 
 void PnaclComponentInstaller::NotifyInstallError() {
   if (!install_callbacks_.empty()) {
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE,
         base::Bind(&PnaclComponentInstaller::NotifyAllWithResult,
                    // Unretained because installer lives until process shutdown.
                    base::Unretained(this), false));
   }
 }
 
 void PnaclComponentInstaller::NotifyInstallSuccess() {
   if (!install_callbacks_.empty()) {
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE,
         base::Bind(&PnaclComponentInstaller::NotifyAllWithResult,
                    // Unretained because installer lives until process shutdown.
                    base::Unretained(this), true));
   }
 }
 
+CrxComponent PnaclComponentInstaller::GetCrxComponent() const {

[Sorin Jianu, 2013/07/03 23:10:04]

In this case, I suggest dropping the const declaration.

[jvoung (off chromium), 2013/07/04 01:11:04]

Done.

+  CrxComponent pnacl_component;
+  pnacl_component.version = current_version();
+  pnacl_component.name = "pnacl";
+  pnacl_component.installer = const_cast<PnaclComponentInstaller*>(this);
+  SetPnaclHash(&pnacl_component);
+
+  return pnacl_component;
+}
+
 namespace {
 
 void FinishPnaclUpdateRegistration(const Version& current_version,
                                    PnaclComponentInstaller* pci) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  CrxComponent pnacl_component;
-  pnacl_component.version = current_version;
-  pnacl_component.name = "pnacl";
-  pnacl_component.installer = pci;
   pci->set_current_version(current_version);
-  SetPnaclHash(&pnacl_component);
+  const CrxComponent pnacl_component = pci->GetCrxComponent();
 
   ComponentUpdateService::Status status =
       pci->cus()->RegisterComponent(pnacl_component);
   if (status != ComponentUpdateService::kOk
       && status != ComponentUpdateService::kReplaced) {
     NOTREACHED() << "Pnacl component registration failed.";
   }
 }
 
 // Check if there is an existing version on disk first to know when
@@ skipping 90 matching lines @@
   // Figure out profile information, before proceeding to look for files.
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&GetProfileInformation, this));
 }
 
 void RequestFirstInstall(ComponentUpdateService* cus,
                          PnaclComponentInstaller* pci,
                           const base::Callback<void(bool)>& installed) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  Version null_version(kNullVersion);
-  CrxComponent pnacl_component;
-  pci->set_current_version(null_version);
-  pnacl_component.version = null_version;
-  pnacl_component.name = "pnacl";
-  pnacl_component.installer = pci;
-  SetPnaclHash(&pnacl_component);
+  pci->set_current_version(Version(kNullVersion));
+  const CrxComponent pnacl_component = pci->GetCrxComponent();
   ComponentUpdateService::Status status = cus->CheckForUpdateSoon(
       pnacl_component);
   if (status != ComponentUpdateService::kOk) {
     installed.Run(false);
     return;
   }
   pci->AddInstallCallback(installed);
 }