Commit f0fcd6c1 authored by Maggie Cai's avatar Maggie Cai Committed by Commit Bot

Remove typo in app_update.cc.

Looks like there is a typo in the merge code for
additional_search_terms, it is still checking for permissions. Non of
the DCHECK condition sounds relevant for additional_search_terms, so
removed the DCHECK.

Bug: None
Change-Id: I2d58a018f622b74583d7e11b3bb70e2b83084619
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1797526Reviewed-by: default avatarNigel Tao <nigeltao@chromium.org>
Commit-Queue: Maggie Cai <mxcai@chromium.org>
Cr-Commit-Position: refs/heads/master@{#695852}
parent 1075828b
...@@ -59,8 +59,6 @@ void AppUpdate::Merge(apps::mojom::App* state, const apps::mojom::App* delta) { ...@@ -59,8 +59,6 @@ void AppUpdate::Merge(apps::mojom::App* state, const apps::mojom::App* delta) {
state->version = delta->version; state->version = delta->version;
} }
if (!delta->additional_search_terms.empty()) { if (!delta->additional_search_terms.empty()) {
DCHECK(state->permissions.empty() ||
(delta->permissions.size() == state->permissions.size()));
state->additional_search_terms.clear(); state->additional_search_terms.clear();
CloneStrings(delta->additional_search_terms, CloneStrings(delta->additional_search_terms,
&state->additional_search_terms); &state->additional_search_terms);
......
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