33 * License, v. 2.0. If a copy of the MPL was not distributed with this file,
44 * You can obtain one at http://mozilla.org/MPL/2.0/. */
55
6+ #include " components/update_client/update_checker.h"
7+
68#include < optional>
79
10+ #include " base/ranges/algorithm.h"
11+ #include " components/update_client/update_client.h"
12+
813#include " src/components/update_client/update_checker.cc"
914
1015#if BUILDFLAG(WIDEVINE_ARM64_DLL_FIX)
1419
1520namespace update_client {
1621
22+ namespace {
23+
24+ bool IsBraveComponent (const Component* component) {
25+ CHECK (component);
26+ const auto & crx_component = component->crx_component ();
27+ if (!crx_component || !crx_component->installer ) {
28+ return false ;
29+ }
30+ return crx_component->installer ->IsBraveComponent ();
31+ }
32+
33+ } // namespace
34+
1735SequentialUpdateChecker::SequentialUpdateChecker (
1836 scoped_refptr<Configurator> config,
1937 PersistedData* metadata)
@@ -39,6 +57,16 @@ void SequentialUpdateChecker::CheckForUpdates(
3957 additional_attributes_ = additional_attributes;
4058 update_check_callback_ = std::move (update_check_callback);
4159
60+ // Partition IDs for batch update checks. The order of
61+ // `components_to_check_for_updates` doesn't matter to the caller, as
62+ // post-update mapping is done via an Id->Component map, making this
63+ // rearrangement safe.
64+ base::ranges::stable_partition (
65+ update_context_->components_to_check_for_updates ,
66+ [&](const std::string& id) {
67+ return IsBraveComponent (update_context_->components [id].get ());
68+ });
69+
4270 for (const auto & id : update_context_->components_to_check_for_updates ) {
4371 remaining_ids_.push_back (id);
4472 }
@@ -56,25 +84,36 @@ void SequentialUpdateChecker::CheckNext(
5684 DCHECK (!remaining_ids_.empty ());
5785 DCHECK (update_context_);
5886
59- const auto id = remaining_ids_.front ();
60- remaining_ids_.pop_front ();
87+ // Support multiple checks in a single call, but only if they are all Brave.
88+ std::vector<std::string> ids;
89+ for (auto id_it = remaining_ids_.begin (); id_it != remaining_ids_.end ();) {
90+ const auto & component = update_context_->components [*id_it];
91+ if (!ids.empty () && !IsBraveComponent (component.get ())) {
92+ break ;
93+ }
94+ ids.push_back (*id_it);
95+ id_it = remaining_ids_.erase (id_it);
96+ }
6197
6298 scoped_refptr<UpdateContext> context = new UpdateContext (
6399 update_context_->config , update_context_->crx_cache_ ,
64- update_context_->is_foreground , update_context_->is_install , {id} ,
100+ update_context_->is_foreground , update_context_->is_install , ids ,
65101 update_context_->crx_state_change_callback ,
66102 update_context_->notify_observers_callback ,
67103 // We don't pass a context callback here because UpdateChecker doesn't use
68104 // it. This is instead done by UpdateEngine, which calls us.
69105 base::DoNothing (), update_context_->persisted_data ,
70106 /* is_update_check_only=*/ false );
71107
72- auto & component = context->components [id];
73- auto & crx_component = update_context_->components [id]->crx_component ();
74- component->set_crx_component (*crx_component);
75- component->set_previous_version (crx_component->version );
76- component->set_previous_fp (crx_component->fingerprint );
77- context->components_to_check_for_updates .push_back (id);
108+ DCHECK (!ids.empty ());
109+ for (const auto & id : ids) {
110+ auto & component = context->components [id];
111+ auto & crx_component = update_context_->components [id]->crx_component ();
112+ component->set_crx_component (*crx_component);
113+ component->set_previous_version (crx_component->version );
114+ component->set_previous_fp (crx_component->fingerprint );
115+ context->components_to_check_for_updates .push_back (id);
116+ }
78117
79118 update_checker_ = UpdateChecker::Create (config_, metadata_);
80119
0 commit comments