Remove PNaCl's RequestFirstInstall, use resource throttle instead

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 177 matching lines @@
 
 }  // namespace
 
 PnaclComponentInstaller::PnaclComponentInstaller()
     : per_user_(false),
       updates_disabled_(false),
       cus_(NULL) {
 #if defined(OS_CHROMEOS)
   per_user_ = true;
 #endif
-  updater_observer_.reset(new PnaclUpdaterObserver(this));
 }
 
 PnaclComponentInstaller::~PnaclComponentInstaller() {
 }
 
 void PnaclComponentInstaller::OnUpdateError(int error) {
   NOTREACHED() << "Pnacl update error: " << error;
 }
 
 // Pnacl components have the version encoded in the path itself:
@@ skipping 27 matching lines @@
   current_profile_path_ = pm->user_data_dir().Append(
       pm->GetInitialProfileDir());
 }
 
 bool PnaclComponentInstaller::Install(const base::DictionaryValue& manifest,
                                       const base::FilePath& unpack_path) {
   scoped_ptr<base::DictionaryValue> pnacl_manifest(
       ReadPnaclManifest(unpack_path));
   if (pnacl_manifest == NULL) {
     LOG(WARNING) << "Failed to read pnacl manifest.";
-    NotifyInstallError();
     return false;
   }
 
   Version version;
   if (!CheckPnaclComponentManifest(manifest, *pnacl_manifest, &version)) {
     LOG(WARNING) << "CheckPnaclComponentManifest failed, not installing.";
-    NotifyInstallError();
     return false;
   }
 
   // Don't install if the current version is actually newer.
   if (current_version().CompareTo(version) > 0) {
-    NotifyInstallError();
     return false;
   }
 
   // Passed the basic tests. Time to install it.
   base::FilePath path = GetPnaclBaseDirectory().AppendASCII(
       version.GetString());
   if (base::PathExists(path)) {
     LOG(WARNING) << "Target path already exists, not installing.";
-    NotifyInstallError();
     return false;
   }
   if (!base::Move(unpack_path, path)) {
     LOG(WARNING) << "Move failed, not installing.";
-    NotifyInstallError();
     return false;
   }
 
   // Installation is done. Now tell the rest of chrome.
   // - The path service.
   // - Callbacks that requested an update.
   set_current_version(version);
-  NotifyInstallSuccess();
   OverrideDirPnaclComponent(path);
   return true;
 }
 
 // Given |file|, which can be a path like "_platform_specific/arm/pnacl_foo",
 // returns the assumed install path. The path separator in |file| is '/'
 // for all platforms. Caller is responsible for checking that the
 // |installed_file| actually exists.
 bool PnaclComponentInstaller::GetInstalledFile(
     const std::string& file, base::FilePath* installed_file) {
   if (current_version().Equals(Version(kNullVersion)))
     return false;
 
   *installed_file = GetPnaclBaseDirectory().AppendASCII(
       current_version().GetString()).AppendASCII(file);
   return true;
 }
 
-void PnaclComponentInstaller::NotifyInstallError() {
-  if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {
-    BrowserThread::PostTask(
-        BrowserThread::UI, FROM_HERE,
-        base::Bind(&PnaclComponentInstaller::NotifyInstallError,
-                   // Unretained because installer lives until process shutdown.
-                   base::Unretained(this)));
-    return;
-  }
-  if (!install_callback_.is_null()) {
-    updater_observer_->StopObserving();
-    install_callback_.Run(false);
-    install_callback_.Reset();
-  }
-}
-
-void PnaclComponentInstaller::NotifyInstallSuccess() {
-  if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {
-    BrowserThread::PostTask(
-        BrowserThread::UI, FROM_HERE,
-        base::Bind(&PnaclComponentInstaller::NotifyInstallSuccess,
-                   // Unretained because installer lives until process shutdown.
-                   base::Unretained(this)));
-    return;
-  }
-  if (!install_callback_.is_null()) {
-    updater_observer_->StopObserving();
-    install_callback_.Run(true);
-    install_callback_.Reset();
-  }
-}
-
 CrxComponent PnaclComponentInstaller::GetCrxComponent() {
   CrxComponent pnacl_component;
   pnacl_component.version = current_version();
   pnacl_component.name = "pnacl";
   pnacl_component.installer = this;
-  pnacl_component.observer = updater_observer_.get();
   pnacl_component.fingerprint = current_fingerprint();
   SetPnaclHash(&pnacl_component);
 
   return pnacl_component;
 }
 
 namespace {
 
 void FinishPnaclUpdateRegistration(const Version& current_version,
                                    const std::string& current_fingerprint,
@@ skipping 123 matching lines @@
   }
 }
 
 void PnaclComponentInstaller::ReRegisterPnacl() {
   DCHECK(per_user_);
   // Figure out profile information, before proceeding to look for files.
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&GetProfileInformation, this));
 }
-
-void PnaclComponentInstaller::RequestFirstInstall(const InstallCallback& cb) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  // Only one request can happen at once.
-  if (!install_callback_.is_null()) {
-    cb.Run(false);
-    return;
-  }
-  set_current_version(Version(kNullVersion));
-  CrxComponent pnacl_component = GetCrxComponent();
-  ComponentUpdateService::Status status = cus_->OnDemandUpdate(
-      GetCrxComponentID(pnacl_component));
-  if (status != ComponentUpdateService::kOk) {
-    cb.Run(false);
-    return;
-  }
-  install_callback_ = cb;
-  updater_observer_->EnsureObserving();
-}