| 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 523995996a46ec7e53c72805f7b066f6ae8ef538..8e46bbd0a5da875a2ea59922cd96b5966b62b206 100644
|
| --- a/chrome/browser/component_updater/pnacl_component_installer.cc
|
| +++ b/chrome/browser/component_updater/pnacl_component_installer.cc
|
| @@ -11,6 +11,7 @@
|
| #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"
|
| @@ -29,6 +30,7 @@
|
| #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;
|
| @@ -225,8 +227,16 @@ base::FilePath PnaclComponentInstaller::GetPnaclBaseDirectory() {
|
| return result;
|
| }
|
|
|
| -bool PnaclComponentInstaller::Install(const base::DictionaryValue& manifest,
|
| - const base::FilePath& unpack_path) {
|
| +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) {
|
| std::unique_ptr<base::DictionaryValue> pnacl_manifest(
|
| ReadPnaclManifest(unpack_path));
|
| if (pnacl_manifest == NULL) {
|
|
|