Add support for uninstalling components and use it in SupervisedUserWhitelistInstaller.

components/component_updater/component_updater_service.cc

 // Copyright 2014 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 "components/component_updater/component_updater_service.h"
 
 #include <algorithm>
 #include <set>
 #include <vector>
 
@@ skipping 82 matching lines @@
  public:
   explicit CrxUpdateService(Configurator* config);
   ~CrxUpdateService() override;
 
   // Overrides for ComponentUpdateService.
   void AddObserver(Observer* observer) override;
   void RemoveObserver(Observer* observer) override;
   Status Start() override;
   Status Stop() override;
   Status RegisterComponent(const CrxComponent& component) override;
+  Status UnregisterComponent(const std::string& crx_id) override;
   std::vector<std::string> GetComponentIDs() const override;
   OnDemandUpdater& GetOnDemandUpdater() override;
   void MaybeThrottle(const std::string& crx_id,
                      const base::Closure& callback) override;
   scoped_refptr<base::SequencedTaskRunner> GetSequencedTaskRunner() override;
 
   // Context for a crx download url request.
   struct CRXContext {
-    ComponentInstaller* installer;
+    scoped_refptr<ComponentInstaller> installer;
     std::vector<uint8_t> pk_hash;
     std::string id;
     std::string fingerprint;
     CRXContext() : installer(NULL) {}
   };
 
  private:
   enum ErrorCategory {
     kErrorNone = 0,
     kNetworkError,
@@ skipping 332 matching lines @@
         timer_.Start(FROM_HERE,
                      base::TimeDelta::FromSeconds(config_->InitialDelay()),
                      this,
                      &CrxUpdateService::ProcessPendingItems);
     }
   }
 
   return kOk;
 }
 
+ComponentUpdateService::Status CrxUpdateService::UnregisterComponent(
+    const std::string& crx_id) {
+  UpdateItems::iterator it = std::find_if(
+      work_items_.begin(), work_items_.end(), CrxUpdateItem::FindById(crx_id));
+  if (it == work_items_.end())
+    return kError;
+
+  CrxUpdateItem* item = *it;
+  CrxUpdateItem::Status status = item->status;
+  if (status == CrxUpdateItem::kDownloading ||
+      status == CrxUpdateItem::kDownloadingDiff ||
+      status == CrxUpdateItem::kUpdating ||
+      status == CrxUpdateItem::kUpdatingDiff) {
+    ChangeItemState(item, CrxUpdateItem::kNoUpdate);
+    ping_manager_->OnUpdateComplete(item);
+  }
+
+  work_items_.erase(it);
+  return kOk;
+}
+
 std::vector<std::string> CrxUpdateService::GetComponentIDs() const {
   DCHECK(thread_checker_.CalledOnValidThread());
   std::vector<std::string> component_ids;
   for (UpdateItems::const_iterator it = work_items_.begin();
        it != work_items_.end();
        ++it) {
     const CrxUpdateItem* item = *it;
     component_ids.push_back(item->id);
   }
   return component_ids;
@@ skipping 300 matching lines @@
 
 // Called when the CRX package has been downloaded to a temporary location.
 // Here we fire the notifications and schedule the component-specific installer
 // to be called in the file thread.
 void CrxUpdateService::DownloadComplete(
     scoped_ptr<CRXContext> crx_context,
     const CrxDownloader::Result& download_result) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   CrxUpdateItem* crx = FindUpdateItemById(crx_context->id);
+
+  // If the item has been removed in the mean time, clean up and return.
+  if (!crx) {
+    crx_downloader_.reset();
+    base::FilePath crx_path = download_result.response;
+    if (!crx_path.empty()) {
+      blocking_task_runner_->PostTask(
+          FROM_HERE,
+          base::Bind(base::IgnoreResult(
+                         &update_client::DeleteFileAndEmptyParentDirectory),
+                     crx_path));
+    }
+    // Move on to the next update, if there is one available.
+    ScheduleNextRun(kStepDelayMedium);
+    return;
+  }
+
   DCHECK(crx->status == CrxUpdateItem::kDownloadingDiff ||
          crx->status == CrxUpdateItem::kDownloading);
 
   AppendDownloadMetrics(crx_downloader_->download_metrics(),
                         &crx->download_metrics);
 
   crx_downloader_.reset();
 
   if (download_result.error) {
     if (crx->status == CrxUpdateItem::kDownloadingDiff) {
@@ skipping 94 matching lines @@
       error_category = kInstallError;
       break;
     default:
       error_category = kUnpackError;
       break;
   }
 
   const bool is_success = error == ComponentUnpacker::kNone;
 
   CrxUpdateItem* item = FindUpdateItemById(component_id);
+
+  // If the item has been removed in the mean time, return.
+  if (!item) {
+    ScheduleNextRun(kStepDelayMedium);
+    return;
+  }
+
   if (item->status == CrxUpdateItem::kUpdatingDiff && !is_success) {
     item->diff_error_category = error_category;
     item->diff_error_code = error;
     item->diff_extra_code1 = extra_code;
     item->diff_update_failed = true;
     size_t count = ChangeItemStatus(CrxUpdateItem::kUpdatingDiff,
                                     CrxUpdateItem::kCanUpdate);
     DCHECK_EQ(count, 1ul);
     ScheduleNextRun(kStepDelayShort);
     return;
@@ skipping 94 matching lines @@
 ///////////////////////////////////////////////////////////////////////////////
 
 // The component update factory. Using the component updater as a singleton
 // is the job of the browser process.
 ComponentUpdateService* ComponentUpdateServiceFactory(Configurator* config) {
   DCHECK(config);
   return new CrxUpdateService(config);
 }
 
 }  // namespace component_updater