Revert of Randomize order in which ready component updates are applied. On demand updates

chrome/browser/component_updater/component_updater_service.cc

 // Copyright 2012 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 "chrome/browser/component_updater/component_updater_service.h"
 
 #include <algorithm>
 #include <set>
 #include <vector>
 
 #include "base/at_exit.h"
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
-#include "base/rand_util.h"
 #include "base/sequenced_task_runner.h"
 #include "base/stl_util.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/timer/timer.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/component_updater/component_patcher.h"
 #include "chrome/browser/component_updater/component_unpacker.h"
 #include "chrome/browser/component_updater/component_updater_ping_manager.h"
 #include "chrome/browser/component_updater/component_updater_utils.h"
 #include "chrome/browser/component_updater/crx_downloader.h"
@@ skipping 538 matching lines @@
   if (ready_upgrade) {
     UpdateComponent(ready_upgrade);
     return;
   }
 
   if (!CheckForUpdates())
     ScheduleNextRun(kStepDelayLong);
 }
 
 CrxUpdateItem* CrxUpdateService::FindReadyComponent() const {
-  std::vector<CrxUpdateItem*> ready;
-  std::vector<CrxUpdateItem*> ready_on_demand;
-  for (std::vector<CrxUpdateItem*>::const_iterator it = work_items_.begin();
-       it != work_items_.end();
-       ++it) {
-    CrxUpdateItem* item = *it;
-    if (item->status == CrxUpdateItem::kCanUpdate) {
-      if (item->on_demand)
-        ready_on_demand.push_back(item);
-      else
-        ready.push_back(item);
+  class Helper {
+   public:
+    static bool IsReadyOnDemand(CrxUpdateItem* item) {
+      return item->on_demand && IsReady(item);
     }
-  }
+    static bool IsReady(CrxUpdateItem* item) {
+      return item->status == CrxUpdateItem::kCanUpdate;
+    }
+  };
 
-  if (ready_on_demand.size() > 0) {
-    return ready_on_demand[base::RandInt(0, ready_on_demand.size() - 1)];
-  }
-  if (ready.size() > 0) {
-    return ready[base::RandInt(0, ready.size() - 1)];
-  }
+  std::vector<CrxUpdateItem*>::const_iterator it = std::find_if(
+      work_items_.begin(), work_items_.end(), Helper::IsReadyOnDemand);
+  if (it != work_items_.end())
+    return *it;
+  it = std::find_if(work_items_.begin(), work_items_.end(), Helper::IsReady);
+  if (it != work_items_.end())
+    return *it;
   return NULL;
 }
 
 // Prepares the components for an update check and initiates the request.
 // On demand components are always included in the update check request.
 // Otherwise, only include components that have not been checked recently.
 bool CrxUpdateService::CheckForUpdates() {
   const base::TimeDelta minimum_recheck_wait_time =
       base::TimeDelta::FromSeconds(config_->MinimumReCheckWait());
   const base::Time now(base::Time::Now());
@@ skipping 407 matching lines @@
 // The component update factory. Using the component updater as a singleton
 // is the job of the browser process.
 ComponentUpdateService* ComponentUpdateServiceFactory(
     ComponentUpdateService::Configurator* config) {
   DCHECK(config);
   return new CrxUpdateService(config);
 }
 
 }  // namespace component_updater