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

chrome/browser/component_updater/swiftshader_component_installer.cc

 // Copyright (c) 2012 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/swiftshader_component_installer.h"
 
 #include <stdint.h>
 #include <string>
 #include <vector>
 
 #include "base/base_paths.h"
 #include "base/bind.h"
-#include "base/bind_helpers.h"
 #include "base/files/file_enumerator.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/strings/string_util.h"
 #include "base/values.h"
 #include "build/build_config.h"
 #include "components/component_updater/component_updater_paths.h"
 #include "components/component_updater/component_updater_service.h"
 #include "components/update_client/update_client.h"
-#include "components/update_client/utils.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/gpu_data_manager.h"
 #include "content/public/browser/gpu_data_manager_observer.h"
 #include "gpu/config/gpu_feature_type.h"
 #include "ui/gl/gl_features.h"
 
 using content::BrowserThread;
 using content::GpuDataManager;
 
 namespace component_updater {
@@ skipping 63 matching lines @@
   GpuDataManager::GetInstance()->RegisterSwiftShaderPath(path);
 }
 
 class SwiftShaderComponentInstaller : public update_client::CrxInstaller {
  public:
   explicit SwiftShaderComponentInstaller(const base::Version& version);
 
   // ComponentInstaller implementation:
   void OnUpdateError(int error) override;
 
-  update_client::CrxInstaller::Result Install(
-      const base::DictionaryValue& manifest,
-      const base::FilePath& unpack_path) override;
+  bool Install(const base::DictionaryValue& manifest,
+               const base::FilePath& unpack_path) override;
 
   bool GetInstalledFile(const std::string& file,
                         base::FilePath* installed_file) override;
 
   bool Uninstall() override;
 
  private:
   ~SwiftShaderComponentInstaller() override {}
 
-  bool DoInstall(const base::DictionaryValue& manifest,
-                 const base::FilePath& unpack_path);
-
   base::Version current_version_;
 };
 
 SwiftShaderComponentInstaller::SwiftShaderComponentInstaller(
     const base::Version& version)
     : current_version_(version) {
   DCHECK(version.IsValid());
 }
 
 void SwiftShaderComponentInstaller::OnUpdateError(int error) {
   NOTREACHED() << "SwiftShader update error: " << error;
 }
 
-update_client::CrxInstaller::Result SwiftShaderComponentInstaller::Install(
-    const base::DictionaryValue& manifest,
-    const base::FilePath& unpack_path) {
-  return update_client::InstallFunctionWrapper(base::Bind(
-      &SwiftShaderComponentInstaller::DoInstall, base::Unretained(this),
-      base::ConstRef(manifest), base::ConstRef(unpack_path)));
-}
-
-bool SwiftShaderComponentInstaller::DoInstall(
+bool SwiftShaderComponentInstaller::Install(
     const base::DictionaryValue& manifest,
     const base::FilePath& unpack_path) {
   std::string name;
   manifest.GetStringASCII("name", &name);
   if (name != kSwiftShaderManifestName)
     return false;
   std::string proposed_version;
   manifest.GetStringASCII("version", &proposed_version);
   base::Version version(proposed_version.c_str());
   if (!version.IsValid())
@@ skipping 118 matching lines @@
 
 void RegisterSwiftShaderComponent(ComponentUpdateService* cus) {
 #if BUILDFLAG(ENABLE_SWIFTSHADER) && defined(ARCH_CPU_X86)
   BrowserThread::PostTask(BrowserThread::FILE,
                           FROM_HERE,
                           base::Bind(&RegisterSwiftShaderPath, cus));
 #endif
 }
 
 }  // namespace component_updater