diff options
| author | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-09 20:20:12 +0000 |
|---|---|---|
| committer | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-09 20:20:12 +0000 |
| commit | cf44261b7ddbb9d5849ed49e918ea82179118e1e (patch) | |
| tree | 51e4c71cd35d99e1839384c7901fa4d10100d38d /chrome/browser/component_updater/component_updater_service.cc | |
| parent | efa5d93850c47d34931c89533ec3f480938e056a (diff) | |
| download | chromium_src-cf44261b7ddbb9d5849ed49e918ea82179118e1e.zip chromium_src-cf44261b7ddbb9d5849ed49e918ea82179118e1e.tar.gz chromium_src-cf44261b7ddbb9d5849ed49e918ea82179118e1e.tar.bz2 | |
Component updater eight piece
"in which we beef up the unit tests and find several bugs"
1- When parsing the xml response components not mentioned there were left in "updating" state so they got stranded there.
2- Wrong condition :
if ((item->status != CrxUpdateItem::kNoUpdate) ||
(item->status != CrxUpdateItem::kUpToDate))
So again some components are stranded in the kNoUpdate state.
Also a new precondition ScheduleNextRun() cannot be called if a url_fetcher is in progress.
BUG=61602
TEST=included
Review URL: http://codereview.chromium.org/7601019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96048 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/component_updater/component_updater_service.cc')
| -rw-r--r-- | chrome/browser/component_updater/component_updater_service.cc | 34 |
1 files changed, 24 insertions, 10 deletions
diff --git a/chrome/browser/component_updater/component_updater_service.cc b/chrome/browser/component_updater/component_updater_service.cc index 3dbf5a7..4e07cb2 100644 --- a/chrome/browser/component_updater/component_updater_service.cc +++ b/chrome/browser/component_updater/component_updater_service.cc @@ -344,6 +344,7 @@ ComponentUpdateService::Status CrxUpdateService::Stop() { // long one. void CrxUpdateService::ScheduleNextRun(bool step_delay) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK(url_fetcher_.get() == NULL); CHECK(!timer_.IsRunning()); // It could be the case that Stop() had been called while a url request // or unpacking was in flight, if so we arrive here but |running_| is @@ -351,17 +352,18 @@ void CrxUpdateService::ScheduleNextRun(bool step_delay) { if (!running_) return; + int64 delay = step_delay ? config_->StepDelay() : config_->NextCheckDelay(); + if (!step_delay) { NotificationService::current()->Notify( chrome::NOTIFICATION_COMPONENT_UPDATER_SLEEPING, Source<ComponentUpdateService>(this), NotificationService::NoDetails()); // Zero is only used for unit tests. - if (0 == config_->NextCheckDelay()) + if (0 == delay) return; } - int64 delay = step_delay ? config_->StepDelay() : config_->NextCheckDelay(); timer_.Start(base::TimeDelta::FromSeconds(delay), this, &CrxUpdateService::ProcessPendingItems); } @@ -489,7 +491,7 @@ void CrxUpdateService::ProcessPendingItems() { for (UpdateItems::const_iterator it = work_items_.begin(); it != work_items_.end(); ++it) { CrxUpdateItem* item = *it; - if ((item->status != CrxUpdateItem::kNoUpdate) || + if ((item->status != CrxUpdateItem::kNoUpdate) && (item->status != CrxUpdateItem::kUpToDate)) continue; base::TimeDelta delta = base::Time::Now() - item->last_check; @@ -532,11 +534,12 @@ void CrxUpdateService::OnURLFetchComplete(const URLFetcher* source, if (FetchSuccess(*source)) { std::string xml; source->GetResponseAsString(&xml); + url_fetcher_.reset(); ParseManifest(xml); } else { + url_fetcher_.reset(); CrxUpdateService::OnParseUpdateManifestFailed("network error"); } - url_fetcher_.reset(); } // Parsing the manifest is either done right now for tests or in a sandboxed @@ -577,16 +580,21 @@ void CrxUpdateService::OnParseUpdateManifestSucceeded( continue; // Not updating this component now. if (it->version.empty()) { + // No version means no update available. crx->status = CrxUpdateItem::kNoUpdate; - continue; // No version means no update available. + continue; } if (!IsVersionNewer(crx->component.version, it->version)) { + // Our component is up to date. crx->status = CrxUpdateItem::kUpToDate; - continue; // Our component is up to date. + continue; } if (!it->browser_min_version.empty()) { - if (IsVersionNewer(chrome_version_, it->browser_min_version)) - continue; // Does not apply for this version. + if (IsVersionNewer(chrome_version_, it->browser_min_version)) { + // Does not apply for this chrome version. + crx->status = CrxUpdateItem::kNoUpdate; + continue; + } } // All test passed. Queue an upgrade for this component and fire the // notifications. @@ -599,6 +607,11 @@ void CrxUpdateService::OnParseUpdateManifestSucceeded( Source<std::string>(&crx->id), NotificationService::NoDetails()); } + + // All the components that are not mentioned in the manifest we + // consider them up to date. + ChangeItemStatus(CrxUpdateItem::kChecking, CrxUpdateItem::kUpToDate); + // If there are updates pending we do a short wait. ScheduleNextRun(update_pending ? true : false); } @@ -624,6 +637,7 @@ void CrxUpdateService::OnURLFetchComplete(const URLFetcher* source, size_t count = ChangeItemStatus(CrxUpdateItem::kDownloading, CrxUpdateItem::kNoUpdate); DCHECK_EQ(count, 1ul); + url_fetcher_.reset(); ScheduleNextRun(false); } else { FilePath temp_crx_path; @@ -631,6 +645,8 @@ void CrxUpdateService::OnURLFetchComplete(const URLFetcher* source, size_t count = ChangeItemStatus(CrxUpdateItem::kDownloading, CrxUpdateItem::kUpdating); DCHECK_EQ(count, 1ul); + url_fetcher_.reset(); + NotificationService::current()->Notify( chrome::NOTIFICATION_COMPONENT_UPDATE_READY, Source<std::string>(&context->id), @@ -642,8 +658,6 @@ void CrxUpdateService::OnURLFetchComplete(const URLFetcher* source, temp_crx_path), config_->StepDelay()); } - - url_fetcher_.reset(); } // Install consists of digital signature verification, unpacking and then |