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

components/update_client/action_update.h

 // Copyright 2015 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.
 
 #ifndef COMPONENTS_UPDATE_CLIENT_ACTION_UPDATE_H_
 #define COMPONENTS_UPDATE_CLIENT_ACTION_UPDATE_H_
 
 #include <map>
 #include <memory>
 #include <string>
@@ skipping 40 matching lines @@
   virtual void OnDownloadStart(CrxUpdateItem* item) = 0;
   virtual void OnDownloadSuccess(
       CrxUpdateItem* item,
       const CrxDownloader::Result& download_result) = 0;
   virtual void OnDownloadError(
       CrxUpdateItem* item,
       const CrxDownloader::Result& download_result) = 0;
   virtual void OnInstallStart(CrxUpdateItem* item) = 0;
   virtual void OnInstallSuccess(CrxUpdateItem* item) = 0;
   virtual void OnInstallError(CrxUpdateItem* item,
-                              UnpackerError error,
+                              ErrorCategory error_category,
+                              int error,
                               int extended_error) = 0;
 
   void StartDownload(CrxUpdateItem* item);
   void DownloadComplete(const std::string& id,
                         const CrxDownloader::Result& download_result);
 
   // Called when progress is being made downloading a CRX. The progress may
   // not monotonically increase due to how the CRX downloader switches between
   // different downloaders and fallback urls.
   void DownloadProgress(const std::string& id,
                         const CrxDownloader::Result& download_result);
 
   void StartInstall(CrxUpdateItem* item, const base::FilePath& crx_path);
   void InstallComplete(const std::string& id,
-                       UnpackerError error,
+                       ErrorCategory error_category,
+                       int error,
                        int extended_error);
 
   void StartUnpackOnBlockingTaskRunner(CrxUpdateItem* item,
                                        const base::FilePath& crx_path);
   void UnpackCompleteOnBlockingTaskRunner(
       CrxUpdateItem* item,
       const base::FilePath& crx_path,
       const ComponentUnpacker::Result& result);
 
   void StartInstallOnBlockingTaskRunner(CrxUpdateItem* item,
                                         const base::FilePath& crx_path,
                                         const base::FilePath& unpack_path);
   void InstallCompleteOnBlockingTaskRunner(CrxUpdateItem* item,
                                            const base::FilePath& crx_path,
-                                           UnpackerError error,
+                                           ErrorCategory error_category,
+                                           int error,
                                            int extended_error);
 
-  // TODO(sorin): make this function return a result data type to convey
-  // extended error information.
-  UnpackerError DoInstall(CrxUpdateItem* item,
-                          const base::FilePath& crx_path,
-                          const base::FilePath& unpack_path);
+  CrxInstaller::Result DoInstall(CrxUpdateItem* item,
+                                 const base::FilePath& crx_path,
+                                 const base::FilePath& unpack_path);
 
   // Downloads updates for one CRX id only.
   std::unique_ptr<CrxDownloader> crx_downloader_;
 
   // Unpacks one CRX.
   scoped_refptr<ComponentUnpacker> unpacker_;
 
   DISALLOW_COPY_AND_ASSIGN(ActionUpdate);
 };
 
@@ skipping 12 matching lines @@
   std::vector<GURL> GetUrls(const CrxUpdateItem* item) override;
   std::string GetHash(const CrxUpdateItem* item) override;
   void OnDownloadStart(CrxUpdateItem* item) override;
   void OnDownloadSuccess(CrxUpdateItem* item,
                          const CrxDownloader::Result& download_result) override;
   void OnDownloadError(CrxUpdateItem* item,
                        const CrxDownloader::Result& download_result) override;
   void OnInstallStart(CrxUpdateItem* item) override;
   void OnInstallSuccess(CrxUpdateItem* item) override;
   void OnInstallError(CrxUpdateItem* item,
-                      UnpackerError error,
+                      ErrorCategory error_category,
+                      int error,
                       int extended_error) override;
 
   DISALLOW_COPY_AND_ASSIGN(ActionUpdateDiff);
 };
 
 class ActionUpdateFull : public ActionUpdate {
  public:
   static std::unique_ptr<Action> Create();
 
  private:
   ActionUpdateFull();
   ~ActionUpdateFull() override;
 
   // ActionUpdate overrides.
   bool IsBackgroundDownload(const CrxUpdateItem* item) override;
   std::vector<GURL> GetUrls(const CrxUpdateItem* item) override;
   std::string GetHash(const CrxUpdateItem* item) override;
   void OnDownloadStart(CrxUpdateItem* item) override;
   void OnDownloadSuccess(CrxUpdateItem* item,
                          const CrxDownloader::Result& download_result) override;
   void OnDownloadError(CrxUpdateItem* item,
                        const CrxDownloader::Result& download_result) override;
   void OnInstallStart(CrxUpdateItem* item) override;
   void OnInstallSuccess(CrxUpdateItem* item) override;
   void OnInstallError(CrxUpdateItem* item,
-                      UnpackerError error,
+                      ErrorCategory error_category,
+                      int error,
                       int extended_error) override;
 
   DISALLOW_COPY_AND_ASSIGN(ActionUpdateFull);
 };
 
 }  // namespace update_client
 
 #endif  // COMPONENTS_UPDATE_CLIENT_ACTION_UPDATE_H_