| Index: chrome/browser/component_updater/supervised_user_whitelist_installer.cc
|
| diff --git a/chrome/browser/component_updater/supervised_user_whitelist_installer.cc b/chrome/browser/component_updater/supervised_user_whitelist_installer.cc
|
| index 55b08602d7840b1c1e6a0651225190aaa467295b..c3083300d330728e22de4e7794850d0f1cd9b571 100644
|
| --- a/chrome/browser/component_updater/supervised_user_whitelist_installer.cc
|
| +++ b/chrome/browser/component_updater/supervised_user_whitelist_installer.cc
|
| @@ -121,7 +121,7 @@ class SupervisedUserWhitelistInstallerImpl
|
| 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_;
|
| };
|
| @@ -141,17 +141,17 @@ void SupervisedUserWhitelistInstallerImpl::RegisterWhitelist(
|
| callback));
|
| scoped_refptr<DefaultComponentInstaller> installer(
|
| new DefaultComponentInstaller(traits.Pass()));
|
| -
|
| installer->Register(cus_);
|
|
|
| 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) {
|
| + const ComponentUpdateService::Status status =
|
| + cus_->UnregisterComponent(crx_id);
|
| + DCHECK_EQ(ComponentUpdateService::kOk, status);
|
| }
|
|
|
| } // namespace
|
|
|