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

Unified Diff: components/component_updater/component_updater_service.cc

Issue 565363002: Implement support for fallback update check urls in the component updater (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkgr
Patch Set: Created 6 years, 3 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: components/component_updater/component_updater_service.cc
diff --git a/components/component_updater/component_updater_service.cc b/components/component_updater/component_updater_service.cc
index b005a15938c23963a656b0e81c75cda39ebd8c26..5e06ab748f8d9811dc9dfeacec53c10229444a3e 100644
--- a/components/component_updater/component_updater_service.cc
+++ b/components/component_updater/component_updater_service.cc
@@ -146,7 +146,8 @@ class CrxUpdateService : public ComponentUpdateService, public OnDemandUpdater {
// Overrides for OnDemandUpdater.
virtual Status OnDemandUpdate(const std::string& component_id) OVERRIDE;
- void UpdateCheckComplete(int error,
+ void UpdateCheckComplete(const GURL& original_url,
+ int error,
const std::string& error_message,
const UpdateResponse::Results& results);
void OnUpdateCheckSucceeded(const UpdateResponse::Results& results);
@@ -613,12 +614,12 @@ bool CrxUpdateService::CheckForUpdates() {
if (items_to_check.empty())
return false;
- update_checker_ =
- UpdateChecker::Create(*config_,
- base::Bind(&CrxUpdateService::UpdateCheckComplete,
- base::Unretained(this))).Pass();
- return update_checker_->CheckForUpdates(items_to_check,
- config_->ExtraRequestParams());
+ update_checker_ = UpdateChecker::Create(*config_).Pass();
+ return update_checker_->CheckForUpdates(
+ items_to_check,
+ config_->ExtraRequestParams(),
+ base::Bind(&CrxUpdateService::UpdateCheckComplete,
+ base::Unretained(this)));
}
void CrxUpdateService::UpdateComponent(CrxUpdateItem* workitem) {
@@ -661,10 +662,12 @@ void CrxUpdateService::UpdateComponent(CrxUpdateItem* workitem) {
}
void CrxUpdateService::UpdateCheckComplete(
+ const GURL& original_url,
int error,
const std::string& error_message,
const UpdateResponse::Results& results) {
DCHECK(thread_checker_.CalledOnValidThread());
+ VLOG(1) << "Update check completed from: " << original_url.spec();
update_checker_.reset();
if (!error)
OnUpdateCheckSucceeded(results);

Powered by Google App Engine
This is Rietveld 408576698