Commit ee7b5651 authored by Sorin Jianu's avatar Sorin Jianu Committed by Commit Bot

Fix recovery component DCHECK on mac OS during browser start up.

It fails an assert in component updater service when the recovery component is registered.
https://chromium-review.googlesource.com/1787402 introduced Omaha-style app ids. However,
the recovery component code was not modify to use appids, and the it fails to register
because the member update_client::CrxComponent::app_id is not set.

TBR=waffles
BUG=1015073,1001126

Change-Id: If5f0c1a7ba2778b5183156d64fd57d745dc099ee
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1865552Reviewed-by: default avatarJoshua Pawlicki <waffles@chromium.org>
Commit-Queue: Sorin Jianu <sorin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#706931}
parent 32550fff
...@@ -305,6 +305,7 @@ void RecoveryRegisterHelper(ComponentUpdateService* cus, PrefService* prefs) { ...@@ -305,6 +305,7 @@ void RecoveryRegisterHelper(ComponentUpdateService* cus, PrefService* prefs) {
recovery.version = version; recovery.version = version;
recovery.pk_hash.assign(kRecoverySha2Hash, recovery.pk_hash.assign(kRecoverySha2Hash,
&kRecoverySha2Hash[sizeof(kRecoverySha2Hash)]); &kRecoverySha2Hash[sizeof(kRecoverySha2Hash)]);
recovery.app_id = update_client::GetCrxIdFromPublicKeyHash(recovery.pk_hash);
recovery.supports_group_policy_enable_component_updates = true; recovery.supports_group_policy_enable_component_updates = true;
recovery.requires_network_encryption = false; recovery.requires_network_encryption = false;
recovery.crx_format_requirement = recovery.crx_format_requirement =
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment