Implement support for fallback update check urls in the component updater

components/component_updater/component_updater_service.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/component_updater/component_updater_service.h"
 
 #include <algorithm>
 #include <set>
 #include <vector>
 
 #include "base/at_exit.h"
 #include "base/bind.h"
+#include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/observer_list.h"
 #include "base/sequenced_task_runner.h"
 #include "base/stl_util.h"
@@ skipping 116 matching lines @@
     kStepDelayLong,
   };
 
   // Overrides for ComponentUpdateService.
   virtual bool GetComponentDetails(const std::string& component_id,
                                    CrxUpdateItem* item) const OVERRIDE;
 
   // 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);
   void OnUpdateCheckFailed(int error, const std::string& error_message);
 
   void DownloadProgress(const std::string& component_id,
                         const CrxDownloader::Result& download_result);
 
   void DownloadComplete(scoped_ptr<CRXContext> crx_context,
                         const CrxDownloader::Result& download_result);
@@ skipping 446 matching lines @@
     item->download_metrics.clear();
 
     items_to_check.push_back(item);
 
     ChangeItemState(item, CrxUpdateItem::kChecking);
   }
 
   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) {
   scoped_ptr<CRXContext> crx_context(new CRXContext);
   crx_context->pk_hash = workitem->component.pk_hash;
   crx_context->id = workitem->id;
   crx_context->installer = workitem->component.installer;
   crx_context->fingerprint = workitem->next_fp;
   const std::vector<GURL>* urls = NULL;
   bool allow_background_download = false;
@@ skipping 22 matching lines @@
       base::Bind(&CrxUpdateService::DownloadProgress,
                  base::Unretained(this),
                  crx_context->id));
   crx_downloader_->StartDownload(*urls,
                                  base::Bind(&CrxUpdateService::DownloadComplete,
                                             base::Unretained(this),
                                             base::Passed(&crx_context)));
 }
 
 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);
   else
     OnUpdateCheckFailed(error, error_message);
 }
 
 // Handles a valid Omaha update check response by matching the results with
 // the registered components which were checked for updates.
 // If updates are found, prepare the components for the actual version upgrade.
@@ skipping 331 matching lines @@
 ///////////////////////////////////////////////////////////////////////////////
 
 // The component update factory. Using the component updater as a singleton
 // is the job of the browser process.
 ComponentUpdateService* ComponentUpdateServiceFactory(Configurator* config) {
   DCHECK(config);
   return new CrxUpdateService(config);
 }
 
 }  // namespace component_updater