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

Unified Diff: chrome/browser/component_updater/pnacl_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/pnacl_component_installer.cc
diff --git a/chrome/browser/component_updater/pnacl_component_installer.cc b/chrome/browser/component_updater/pnacl_component_installer.cc
index 8e46bbd0a5da875a2ea59922cd96b5966b62b206..523995996a46ec7e53c72805f7b066f6ae8ef538 100644
--- a/chrome/browser/component_updater/pnacl_component_installer.cc
+++ b/chrome/browser/component_updater/pnacl_component_installer.cc
@@ -11,7 +11,6 @@
#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"
@@ -30,7 +29,6 @@
#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;
@@ -227,16 +225,8 @@
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) {

Powered by Google App Engine
This is Rietveld 408576698