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

chrome/browser/component_updater/pnacl_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/pnacl_component_installer.h"
 
 #include <stdint.h>
 #include <string>
 #include <vector>
 
 #include "base/atomicops.h"
 #include "base/base_paths.h"
 #include "base/bind.h"
-#include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/files/file_enumerator.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/path_service.h"
 #include "base/strings/string_util.h"
 #include "base/values.h"
 #include "base/version.h"
 #include "base/win/windows_version.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/common/chrome_paths.h"
 #include "components/component_updater/component_updater_service.h"
 #include "components/nacl/common/nacl_switches.h"
 #include "components/update_client/update_query_params.h"
-#include "components/update_client/utils.h"
 #include "content/public/browser/browser_thread.h"
 
 using content::BrowserThread;
 using update_client::CrxComponent;
 using update_client::UpdateQueryParams;
 
 namespace component_updater {
 
 namespace {
 
@@ skipping 176 matching lines @@
 // Pnacl components have the version encoded in the path itself:
 // <profile>\AppData\Local\Google\Chrome\User Data\pnacl\0.1.2.3\.
 // and the base directory will be:
 // <profile>\AppData\Local\Google\Chrome\User Data\pnacl\.
 base::FilePath PnaclComponentInstaller::GetPnaclBaseDirectory() {
   base::FilePath result;
   CHECK(PathService::Get(chrome::DIR_PNACL_BASE, &result));
   return result;
 }
 
-update_client::CrxInstaller::Result PnaclComponentInstaller::Install(
-    const base::DictionaryValue& manifest,
-    const base::FilePath& unpack_path) {
-  return update_client::InstallFunctionWrapper(
-      base::Bind(&PnaclComponentInstaller::DoInstall, base::Unretained(this),
-                 base::ConstRef(manifest), base::ConstRef(unpack_path)));
-}
-
-bool PnaclComponentInstaller::DoInstall(const base::DictionaryValue& manifest,
-                                        const base::FilePath& unpack_path) {
+bool PnaclComponentInstaller::Install(const base::DictionaryValue& manifest,
+                                      const base::FilePath& unpack_path) {
   std::unique_ptr<base::DictionaryValue> pnacl_manifest(
       ReadPnaclManifest(unpack_path));
   if (pnacl_manifest == NULL) {
     LOG(WARNING) << "Failed to read pnacl manifest.";
     return false;
   }
 
   base::Version version;
   if (!CheckPnaclComponentManifest(manifest, *pnacl_manifest, &version)) {
     LOG(WARNING) << "CheckPnaclComponentManifest failed, not installing.";
@@ skipping 140 matching lines @@
 }  // namespace component_updater
 
 namespace pnacl {
 
 bool NeedsOnDemandUpdate() {
   return base::subtle::NoBarrier_Load(
              &component_updater::needs_on_demand_update) != 0;
 }
 
 }  // namespace pnacl