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

chrome/browser/component_updater/pepper_flash_component_installer.cc

 // Copyright (c) 2013 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/pepper_flash_component_installer.h"
 
 #include <stddef.h>
 
 #include <memory>
 #include <string>
@@ skipping 18 matching lines @@
 #include "chrome/browser/plugins/plugin_prefs.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_content_client.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pepper_flash.h"
 #include "chrome/common/ppapi_utils.h"
 #include "components/component_updater/component_updater_service.h"
 #include "components/component_updater/default_component_installer.h"
 #include "components/update_client/update_client.h"
+#include "components/update_client/update_client_errors.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/plugin_service.h"
 #include "content/public/common/content_constants.h"
 #include "content/public/common/pepper_plugin_info.h"
 #include "ppapi/shared_impl/ppapi_permissions.h"
 
 #if defined(OS_LINUX)
 #include "chrome/common/component_flash_hint_file_linux.h"
 #endif  // defined(OS_LINUX)
 
@@ skipping 103 matching lines @@
 #if defined(GOOGLE_CHROME_BUILD)
 class FlashComponentInstallerTraits : public ComponentInstallerTraits {
  public:
   FlashComponentInstallerTraits();
   ~FlashComponentInstallerTraits() override {}
 
  private:
   // The following methods override ComponentInstallerTraits.
   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;
   bool VerifyInstallation(const base::DictionaryValue& manifest,
                           const base::FilePath& install_dir) const override;
   void ComponentReady(const base::Version& version,
                       const base::FilePath& path,
                       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;
 
   DISALLOW_COPY_AND_ASSIGN(FlashComponentInstallerTraits);
 };
 
 FlashComponentInstallerTraits::FlashComponentInstallerTraits() {}
 
 bool FlashComponentInstallerTraits::SupportsGroupPolicyEnabledComponentUpdates()
     const {
   return true;
 }
 
 bool FlashComponentInstallerTraits::RequiresNetworkEncryption() const {
   return false;
 }
 
-bool FlashComponentInstallerTraits::OnCustomInstall(
+update_client::CrxInstaller::Result
+FlashComponentInstallerTraits::OnCustomInstall(
     const base::DictionaryValue& manifest,
     const base::FilePath& install_dir) {
 #if defined(OS_LINUX)
   const base::FilePath flash_path =
       install_dir.Append(chrome::kPepperFlashPluginFilename);
   // Populate the component updated flash hint file so that the zygote can
   // locate and preload the latest version of flash.
   std::string version;
-  if (!manifest.GetString("version", &version))
-    return false;
+  if (!manifest.GetString("version", &version)) {
+    return update_client::CrxInstaller::Result(
+        update_client::InstallError::GENERIC_ERROR);
+  }
   if (!component_flash_hint_file::RecordFlashUpdate(flash_path, flash_path,
                                                     version)) {
-    return false;
+    return update_client::CrxInstaller::Result(
+        update_client::InstallError::GENERIC_ERROR);
   }
 #endif  // defined(OS_LINUX)
-  return true;
+  return update_client::CrxInstaller::Result(update_client::InstallError::NONE);
 }
 
 void FlashComponentInstallerTraits::ComponentReady(
     const base::Version& version,
     const base::FilePath& path,
     std::unique_ptr<base::DictionaryValue> manifest) {
 #if !defined(OS_LINUX)
   // Installation is done. Now tell the rest of chrome. Both the path service
   // and to the plugin service. On Linux, a restart is required to use the new
   // Flash version, so we do not do this.
@@ skipping 50 matching lines @@
   std::unique_ptr<ComponentInstallerTraits> traits(
       new FlashComponentInstallerTraits);
   // |cus| will take ownership of |installer| during installer->Register(cus).
   DefaultComponentInstaller* installer =
       new DefaultComponentInstaller(std::move(traits));
   installer->Register(cus, base::Closure());
 #endif  // defined(GOOGLE_CHROME_BUILD)
 }
 
 }  // namespace component_updater