Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(994)

Unified Diff: chrome/browser/component_updater/recovery_component_installer.cc

Issue 2483513002: Revert of Makes the component installers return a Result instead of a bool. (Closed)
Patch Set: Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/component_updater/recovery_component_installer.cc
diff --git a/chrome/browser/component_updater/recovery_component_installer.cc b/chrome/browser/component_updater/recovery_component_installer.cc
index aca11bba95459131121aa41600ac061c70374155..063a0037211245a1b13e388c63861f4154928e91 100644
--- a/chrome/browser/component_updater/recovery_component_installer.cc
+++ b/chrome/browser/component_updater/recovery_component_installer.cc
@@ -11,7 +11,6 @@
#include "base/base_paths.h"
#include "base/bind.h"
-#include "base/bind_helpers.h"
#include "base/command_line.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
@@ -35,7 +34,6 @@
#include "components/prefs/pref_registry_simple.h"
#include "components/prefs/pref_service.h"
#include "components/update_client/update_client.h"
-#include "components/update_client/utils.h"
#include "content/public/browser/browser_thread.h"
using content::BrowserThread;
@@ -202,9 +200,8 @@
// 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;
@@ -213,9 +210,6 @@
private:
~RecoveryComponentInstaller() override {}
-
- bool DoInstall(const base::DictionaryValue& manifest,
- const base::FilePath& unpack_path);
bool RunInstallCommand(const base::CommandLine& cmdline,
const base::FilePath& installer_folder) const;
@@ -353,17 +347,8 @@
}
#endif // defined(OS_POSIX)
-update_client::CrxInstaller::Result RecoveryComponentInstaller::Install(
- const base::DictionaryValue& manifest,
- const base::FilePath& unpack_path) {
- return update_client::InstallFunctionWrapper(
- base::Bind(&RecoveryComponentInstaller::DoInstall, base::Unretained(this),
- base::ConstRef(manifest), base::ConstRef(unpack_path)));
-}
-
-bool RecoveryComponentInstaller::DoInstall(
- const base::DictionaryValue& manifest,
- const base::FilePath& unpack_path) {
+bool RecoveryComponentInstaller::Install(const base::DictionaryValue& manifest,
+ const base::FilePath& unpack_path) {
std::string name;
manifest.GetStringASCII("name", &name);
if (name != kRecoveryManifestName)

Powered by Google App Engine
This is Rietveld 408576698