Makes the component installers return a Result instead of a bool.

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 <stddef.h>
 
 #include <map>
 #include <utility>
@@ skipping 22 matching lines @@
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/pref_names.h"
 #include "components/component_updater/component_updater_paths.h"
 #include "components/component_updater/component_updater_service.h"
 #include "components/component_updater/default_component_installer.h"
 #include "components/crx_file/id_util.h"
 #include "components/prefs/pref_registry_simple.h"
 #include "components/prefs/pref_service.h"
 #include "components/prefs/scoped_user_pref_update.h"
 #include "components/safe_json/json_sanitizer.h"
+#include "components/update_client/update_client_errors.h"
 #include "content/public/browser/browser_thread.h"
 
 namespace component_updater {
 
 namespace {
 
 const char kSanitizedWhitelistExtension[] = ".json";
 
 const char kWhitelistedContent[] = "whitelisted_content";
 const char kSites[] = "sites";
@@ skipping 192 matching lines @@
       const RawWhitelistReadyCallback& callback)
       : crx_id_(crx_id), name_(name), callback_(callback) {}
   ~SupervisedUserWhitelistComponentInstallerTraits() override {}
 
  private:
   // ComponentInstallerTraits overrides:
   bool VerifyInstallation(const base::DictionaryValue& manifest,
                           const base::FilePath& install_dir) const override;
   bool SupportsGroupPolicyEnabledComponentUpdates() const override;
   bool RequiresNetworkEncryption() const override;
-  bool OnCustomInstall(const base::DictionaryValue& manifest,
-                       const base::FilePath& install_dir) override;
+  update_client::CrxInstaller::Result OnCustomInstall(
+      const base::DictionaryValue& manifest,
+      const base::FilePath& install_dir) override;
   void ComponentReady(const base::Version& version,
                       const base::FilePath& install_dir,
                       std::unique_ptr<base::DictionaryValue> manifest) override;
   base::FilePath GetRelativeInstallDir() const override;
   void GetHash(std::vector<uint8_t>* hash) const override;
   std::string GetName() const override;
   update_client::InstallerAttributes GetInstallerAttributes() const override;
   std::vector<std::string> GetMimeTypes() const override;
 
   std::string crx_id_;
@@ skipping 14 matching lines @@
 bool SupervisedUserWhitelistComponentInstallerTraits::
     SupportsGroupPolicyEnabledComponentUpdates() const {
   return false;
 }
 
 bool SupervisedUserWhitelistComponentInstallerTraits::
     RequiresNetworkEncryption() const {
   return true;
 }
 
-bool SupervisedUserWhitelistComponentInstallerTraits::OnCustomInstall(
+update_client::CrxInstaller::Result
+SupervisedUserWhitelistComponentInstallerTraits::OnCustomInstall(
     const base::DictionaryValue& manifest,
     const base::FilePath& install_dir) {
   // Delete the existing sanitized whitelist.
-  return base::DeleteFile(GetSanitizedWhitelistPath(crx_id_), false);
+  const bool success =
+      base::DeleteFile(GetSanitizedWhitelistPath(crx_id_), false);
+  return update_client::CrxInstaller::Result(
+      success ? update_client::InstallError::NONE
+              : update_client::InstallError::GENERIC_ERROR);
 }
 
 void SupervisedUserWhitelistComponentInstallerTraits::ComponentReady(
     const base::Version& version,
     const base::FilePath& install_dir,
     std::unique_ptr<base::DictionaryValue> manifest) {
   // TODO(treib): Before getting the title, we should localize the manifest
   // using extension_l10n_util::LocalizeExtension, but that doesn't exist on
   // Android. crbug.com/558387
   callback_.Run(GetWhitelistTitle(*manifest),
@@ skipping 334 matching lines @@
 
 // static
 void SupervisedUserWhitelistInstaller::TriggerComponentUpdate(
     OnDemandUpdater* updater,
     const std::string& crx_id) {
   // TODO(sorin): use a callback to check the result (crbug.com/639189).
   updater->OnDemandUpdate(crx_id, component_updater::Callback());
 }
 
 }  // namespace component_updater