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

Unified Diff: chrome/browser/chromeos/app_mode/kiosk_external_updater.cc

Issue 829583002: Validate hash_sha256 checksum on .crx update. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix unittest build for windows. Created 5 years, 10 months 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/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;
}
« no previous file with comments | « chrome/browser/chromeos/app_mode/kiosk_external_updater.h ('k') | chrome/browser/chromeos/extensions/external_cache.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698