Add support for uninstalling components and use it in SupervisedUserWhitelistInstaller.

chrome/browser/component_updater/supervised_user_whitelist_installer.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 "chrome/browser/component_updater/supervised_user_whitelist_installer.h"
 
 #include <vector>
 
 #include "base/callback.h"
 #include "base/files/file_path.h"
@@ skipping 103 matching lines @@
  public:
   explicit SupervisedUserWhitelistInstallerImpl(ComponentUpdateService* cus);
   ~SupervisedUserWhitelistInstallerImpl() override {}
 
  private:
   // SupervisedUserWhitelistInstaller overrides:
   void RegisterWhitelist(const std::string& crx_id,
                          const std::string& name,
                          bool newly_added,
                          const WhitelistReadyCallback& callback) override;
-  void UnregisterWhitelist(const std::string& crx_id) override;
+  void UninstallWhitelist(const std::string& crx_id) override;
 
   ComponentUpdateService* cus_;
+  std::map<std::string, scoped_refptr<DefaultComponentInstaller>> installers_;
 };
 
 SupervisedUserWhitelistInstallerImpl::SupervisedUserWhitelistInstallerImpl(
     ComponentUpdateService* cus)
     : cus_(cus) {
 }
 
 void SupervisedUserWhitelistInstallerImpl::RegisterWhitelist(
     const std::string& crx_id,
     const std::string& name,
     bool newly_added,
     const WhitelistReadyCallback& callback) {
   scoped_ptr<ComponentInstallerTraits> traits(
       new SupervisedUserWhitelistComponentInstallerTraits(crx_id, name,
                                                           callback));
-  DefaultComponentInstaller* installer =
-      new DefaultComponentInstaller(traits.Pass());
+  scoped_refptr<DefaultComponentInstaller> installer(
+      new DefaultComponentInstaller(traits.Pass()));
 
-  // Takes ownership of |installer|.
   installer->Register(cus_);
 
+  installers_[crx_id] = installer;
+
   if (newly_added)
     TriggerComponentUpdate(&cus_->GetOnDemandUpdater(), crx_id);
 }
 
-void SupervisedUserWhitelistInstallerImpl::UnregisterWhitelist(
-    const std::string& id) {
-  // TODO(bauerb): Implement!
-  NOTIMPLEMENTED();
+void SupervisedUserWhitelistInstallerImpl::UninstallWhitelist(
+    const std::string& crx_id) {
+  auto it = installers_.find(crx_id);

[Marc Treib, 2015/02/04 09:55:46]

nit: DCHECK_NE(it, installers_.end()) ?

[Bernhard Bauer, 2015/02/04 11:28:40]

Done. Not using DCHECK_NE, because AFAICR that didn't work with MSVC (DCHECK_NE
will print the value on failure, and an STL iterator can't be stringified in the
MS implementation).

+  it->second->Unregister(cus_);
+  installers_.erase(it);
 }
 
 }  // namespace
 
 // static
 scoped_ptr<SupervisedUserWhitelistInstaller>
 SupervisedUserWhitelistInstaller::Create(ComponentUpdateService* cus) {
   return make_scoped_ptr(new SupervisedUserWhitelistInstallerImpl(cus));
 }
 
@@ skipping 20 matching lines @@
 }
 
 // static
 void SupervisedUserWhitelistInstaller::TriggerComponentUpdate(
     OnDemandUpdater* updater,
     const std::string& crx_id) {
   updater->OnDemandUpdate(crx_id);
 }
 
 }  // namespace component_updater