| Index: chrome/browser/chromeos/app_mode/kiosk_external_updater.cc
|
| diff --git a/chrome/browser/chromeos/app_mode/kiosk_external_updater.cc b/chrome/browser/chromeos/app_mode/kiosk_external_updater.cc
|
| index bcef46201806b4cbc0bbf567b88e818f4be2366c..1617cc8a55d33db5c26cbecb75665cb92b65f6c9 100644
|
| --- a/chrome/browser/chromeos/app_mode/kiosk_external_updater.cc
|
| +++ b/chrome/browser/chromeos/app_mode/kiosk_external_updater.cc
|
| @@ -93,6 +93,9 @@ bool ShouldUpdateForHigherVersion(const std::string& version_1,
|
| KioskExternalUpdater::ExternalUpdate::ExternalUpdate() {
|
| }
|
|
|
| +KioskExternalUpdater::ExternalUpdate::~ExternalUpdate() {
|
| +}
|
| +
|
| KioskExternalUpdater::KioskExternalUpdater(
|
| const scoped_refptr<base::SequencedTaskRunner>& backend_task_runner,
|
| const base::FilePath& crx_cache_dir,
|
| @@ -196,7 +199,8 @@ void KioskExternalUpdater::OnExtenalUpdateUnpackSuccess(
|
| if (CheckExternalUpdateInterrupted())
|
| return;
|
|
|
| - base::FilePath external_crx_path = external_updates_[app_id].external_crx;
|
| + base::FilePath external_crx_path =
|
| + external_updates_[app_id].external_crx.path;
|
| base::FilePath temp_crx_path =
|
| crx_unpack_dir_.Append(external_crx_path.BaseName());
|
| bool* success = new bool;
|
| @@ -291,7 +295,8 @@ void KioskExternalUpdater::ProcessParsedManifest(
|
| } else {
|
| NOTREACHED();
|
| }
|
| - update.external_crx = external_update_path_.AppendASCII(external_crx_str);
|
| + update.external_crx = extensions::CRXFileInfo(
|
| + app_id, external_update_path_.AppendASCII(external_crx_str));
|
| update.update_status = PENDING;
|
| external_updates_[app_id] = update;
|
| }
|
| @@ -326,7 +331,6 @@ void KioskExternalUpdater::ValidateExternalUpdates() {
|
| if (it->second.update_status == PENDING) {
|
| scoped_refptr<KioskExternalUpdateValidator> crx_validator =
|
| new KioskExternalUpdateValidator(backend_task_runner_,
|
| - it->first,
|
| it->second.external_crx,
|
| crx_unpack_dir_,
|
| weak_factory_.GetWeakPtr());
|
| @@ -429,7 +433,7 @@ void KioskExternalUpdater::OnPutValidatedExtension(const std::string& app_id,
|
| external_updates_[app_id].update_status = FAILED;
|
| external_updates_[app_id].error = l10n_util::GetStringFUTF16(
|
| IDS_KIOSK_EXTERNAL_UPDATE_CANNOT_INSTALL_IN_LOCAL_CACHE,
|
| - base::UTF8ToUTF16(external_updates_[app_id].external_crx.value()));
|
| + base::UTF8ToUTF16(external_updates_[app_id].external_crx.path.value()));
|
| } else {
|
| external_updates_[app_id].update_status = SUCCESS;
|
| }
|
|
|