AU: Remove support for old-style updates.
This code is basically untested, unused and a security risk. So, remove...
BUG=chromium-os:12542
TEST=unit tests, tested VM update
Change-Id: Ibed0582b09497acef9debdf88658cddc2b5cecce
Reviewed-on: http://gerrit.chromium.org/gerrit/8728
Tested-by: Darin Petkov <petkov@chromium.org>
Reviewed-by: Andrew de los Reyes <adlr@chromium.org>
Commit-Ready: Darin Petkov <petkov@chromium.org>
diff --git a/update_attempter.cc b/update_attempter.cc
index 8953803..4eb2d87 100644
--- a/update_attempter.cc
+++ b/update_attempter.cc
@@ -116,7 +116,6 @@
last_checked_time_(0),
new_version_("0.0.0.0"),
new_size_(0),
- is_full_update_(false),
proxy_manual_checks_(0),
obeying_proxies_(true),
chrome_proxy_resolver_(dbus_iface),
@@ -395,11 +394,10 @@
}
}
if (code != kActionCodeSuccess) {
- // If this was a delta update attempt and the current state is at or past
- // the download phase, count the failure in case a switch to full update
- // becomes necessary. Ignore network transfer timeouts and failures.
+ // If the current state is at or past the download phase, count the failure
+ // in case a switch to full update becomes necessary. Ignore network
+ // transfer timeouts and failures.
if (status_ >= UPDATE_STATUS_DOWNLOADING &&
- !is_full_update_ &&
code != kActionCodeDownloadTransferError) {
MarkDeltaUpdateFailure();
}
@@ -419,7 +417,6 @@
// TODO(adlr): put version in InstallPlan
new_version_ = "0.0.0.0";
new_size_ = plan.size;
- is_full_update_ = plan.is_full_update;
SetupDownload();
SetupPriorityManagement();
SetStatusAndNotify(UPDATE_STATUS_UPDATE_AVAILABLE);
@@ -655,7 +652,6 @@
}
void UpdateAttempter::MarkDeltaUpdateFailure() {
- CHECK(!is_full_update_);
// Don't try to resume a failed delta update.
DeltaPerformer::ResetUpdateProgress(prefs_, false);
int64_t delta_failures;