commit c2e1e4ce2f98badb77b780e067d87fb610842874
author Justin Donnelly <jdonnelly@chromium.org> Tue May 28 23:06:13 2024
committer Chromium LUCI CQ <chromium-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue May 28 23:06:13 2024
tree 3fd35b4e0a31abc265ee72bf5ba6531d3e8cbd37
parent 311db3a471d193dfc35969f550413f97a0901d69

[lensoverlay] M126 cherry-picks batch 2.

This includes all changes listed below. Merging via FastPath++
(go/fastpath-chromnient).

I have done the following to verify correctness of this batch:
- Built the chrome, browser_tests and unit_tests targets on the branch
  with these chages applied.
- Run unit_tests and browser_tests and verified that no new failures
  have been introduced.
- Manually tested and validated the LensOverlay feature enabled.
- Manually tested general usage with the feature disabled.

----------

[lensoverlay] Send filter and platform, and update lns_mode text

Only sends lns_mode=text for Lens selections.

Bug: 342663574
Change-Id: I12805fa75aa6f00f3579ad74b5ba8074f203a89f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5571130
Reviewed-by: Juan Mojica <juanmojica@google.com>
Commit-Queue: Jason Hu <hujasonx@google.com>
Cr-Commit-Position: refs/heads/main@{#1306109}
(cherry picked from commit 69a72962dd0aa509f921627fd4167d381759f752)


[lensoverlay] Show context menu when text detected in region.

Demo: https://screencast.googleplex.com/cast/NjAyNDI4Njc2NTU4MDI4OHwyNjgyNWE3Ny00Mw

Bug: b:341366067
Change-Id: I9ac8e6d687afe69623980be1f42b25730ecce1db
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5567729
Reviewed-by: Jason Hu <hujasonx@google.com>
Commit-Queue: Bryan Nguyen <nguyenbryan@google.com>
C-Commit-Position: refs/heads/main@{#1306026}
(cherry picked from commit 9b6197ba4012419b0218cf1706bd22845bdaa87b)


[lensoverlay] Makes the dynamic theme colors available to the WebUI

Using the dynamic theme colors in the WebUI will be a followup CL.

Bug: 341968225
Change-Id: I78f0e2c48eeda88c535c598c157dd007c5f2c5f5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5570412
Reviewed-by: danakj <danakj@chromium.org>
Reviewed-by: Jason Hu <hujasonx@google.com>
Commit-Queue: Moe Ahmadi <mahmadi@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1305992}
(cherry picked from commit bf4c5ac00d291a8fcb9fee1385a093dc2b55c901)


[lensoverlay] Update server protos from upstream

Some protos were removed, but they are unused in the Chromium codebase
so it should be safe.

Bug: 339219366
Change-Id: Iaf85af999dd48aa3582dd45baa0c1e9ae474ac7d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5569638
Commit-Queue: Jason Hu <hujasonx@google.com>
Reviewed-by: Bryan Nguyen <nguyenbryan@google.com>
Cr-Commit-Position: refs/heads/main@{#1305872}
(cherry picked from commit 551b3ec4b2679ca027224ac3c85f423874df7b3d)


[lensoverlay] Resolves dynamic color palette based on screenshot

1. Calls dynamic color palette resolution upon screenshot success.
2. Saves the palette identifier on the initialization data.
3. Adds tests.

Bug: b/340358494
Change-Id: I5bf1371b101a1173973e991cd7c6f4fdbfa1c83f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5559110
Commit-Queue: Moe Ahmadi <mahmadi@chromium.org>
Reviewed-by: Jason Hu <hujasonx@google.com>
Cr-Commit-Position: refs/heads/main@{#1305757}
(cherry picked from commit 2c0e4e504ed3864dfc2633e3b7726f88181e2a98)


[lensoverlay] Extract css and ts colors into variables

Also updates some colors:
Updated opacity of the gradient scrim
Updated the color and opacity of the main background scrim
Updated the colors of text menu items
Updates defaultScrim to 0% opacity by default, so I renamed it to
extraScrim.
Updates the way the cursor icon is rendered, so that it can be recolored

Bug: 342189769
Change-Id: I02d7015d4cde6c4c0c46532f4e08d5a071aaa374
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5560303
Reviewed-by: Moe Ahmadi <mahmadi@chromium.org>
Commit-Queue: Jason Hu <hujasonx@google.com>
Cr-Commit-Position: refs/heads/main@{#1305478}
(cherry picked from commit 82a1965a61683de7ee710842a0dc7e6cc4613db9)


[lensoverlay] Add functions for finding words in selection region.

Visualization: https://screenshot.googleplex.com/6FsHydyLB8CJq3h

Bug: b:341366067
Change-Id: I45e08d300d8b475d963d3c4c1e6c17055ebaab4d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5565272
Commit-Queue: Bryan Nguyen <nguyenbryan@google.com>
Reviewed-by: Jason Hu <hujasonx@google.com>
Cr-Commit-Position: refs/heads/main@{#1305405}
(cherry picked from commit 05d28142ee2402f2584a7d5144b84658d67c6807)


[lensoverlay] Set Lens footprint url param for text selection

Bug: 341339414
Change-Id: I352719cd94445bcb5fbcc3210107f4772bcd0e51
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5560150
Reviewed-by: Juan Mojica <juanmojica@google.com>
Commit-Queue: Jason Hu <hujasonx@google.com>
Cr-Commit-Position: refs/heads/main@{#1305397}
(cherry picked from commit b353de22494f315bb34959619c3a50ed55cbad6a)


[lensoverlay] Add 3 dot menu to overlay.

This CL:
 -Combines the feedback and info buttons into a more options button +
menu dropdown
 -Renames info/send feedback button resources to reflect the fact that
they are now apart of a more options menu
 -Combines tests for info/send feedback buttons into a more options
button test.
 -Adds resources and support for "My Activity" link.

https://screencast.googleplex.com/cast/NTg1NzQxNTg3NzYyMzgwOHxiODQ2M2IzOS1iMA

Bug: 340920941
Change-Id: I1ccc3ad7ca73394694922c43525db63c3e6e249f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5560603
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Commit-Queue: Nihar Majmudar <niharm@google.com>
Reviewed-by: Justin Donnelly <jdonnelly@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1305384}
(cherry picked from commit 4810a2d17b1b7fcd2de269c9d36642910be40450)


[lensoverlay] Use "auto" for source language and Translate language synonyms for target language.

Bug: b:339024571
Change-Id: I54debbbb073c455c014b69b3e99c981a3a143807
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5560523
Commit-Queue: Bryan Nguyen <nguyenbryan@google.com>
Reviewed-by: Jason Hu <hujasonx@google.com>
Cr-Commit-Position: refs/heads/main@{#1305253}
(cherry picked from commit fe709d5965fb9d556d879fafb4a5fd750fb5dcc6)


[lensoverlay] Expand search stack push and pop logic.

There are two major goals for this change:
- Remove the thumbnail from the searchbox when the user clicks a related search in the SRP.
- Ensure that pushing and then popping searches from the query history stack saves and restores all necessary state that the overlay and searchbox rely on.

Theoretically, these could have been handled in separate CLs but the code is related and I think it'll be easier to review and land together.

Specifically, this CL includes the following changes:
- Renames a number of variables to be more consistently named between corresponding values in the controller and in the `SearchQuery` struct.
- Adds `additional_search_query_params_` to the `SearchQuery` struct for saving and restoring.
- Has `AddQueryToHistory` infer when a search URL looks like it was a SRP click and then clears the searchbox thumbnail and overlay selection in this case.
- Has `PopAndLoadQueryFromHistory` restore additional state so that searchbox suggestions and search URLs are correct.
- Removes `LensOverlayController::IssueObjectSelectionRequest` and downstream code, which appear to be unused.

Bug: b:340591543, b:335718601, b:341804325, 342390515
Change-Id: I71c9afbb46f7ddf653f17a07093a54184156698d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5548877
Commit-Queue: Justin Donnelly <jdonnelly@chromium.org>
Code-Coverage: findit-for-me@appspot.gserviceaccount.com <findit-for-me@appspot.gserviceaccount.com>
Reviewed-by: Juan Mojica <juanmojica@google.com>
Cr-Commit-Position: refs/heads/main@{#1305205}
(cherry picked from commit f4dbdbc064a6c39c8f390625f55d580d1f2093eb)


[lensoverlay] Hide cursor tooltip when cursor is over context menu

Also fixes some extra right padding being added to the tooltip

Bug: 341587626, 341587628
Change-Id: Ice83bc90592549d2f9efd9e1ed235cb5afcab91d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5560964
Commit-Queue: Jason Hu <hujasonx@google.com>
Reviewed-by: Bryan Nguyen <nguyenbryan@google.com>
Cr-Commit-Position: refs/heads/main@{#1304779}
(cherry picked from commit e0e411d0119fbff06a6562cdec45c6999b26b0c9)


[lensoverlay] Update initial tooltip aria label

Bug: 342184802
Change-Id: Ie19de25be1330db2cb8b7fa2b2b905794af779d6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5559365
Reviewed-by: Juan Mojica <juanmojica@google.com>
Commit-Queue: Jason Hu <hujasonx@google.com>
Cr-Commit-Position: refs/heads/main@{#1304643}
(cherry picked from commit 49817154c6de9862c9b240c55d9f87d4dceb2f65)


[lensoverlay] Fix dark mode side panel regressions.

Add back loading results image background color due to laggy animation
between LRP and SRP. Fix back arrow dark mode color. Regressions caused
in https://crrev.com/c/5555264.

Bug: 342187014
Change-Id: I2c0a660f81acea2504a4c0719edb9681e1808348
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5559724
Commit-Queue: Nihar Majmudar <niharm@google.com>
Reviewed-by: Juan Mojica <juanmojica@google.com>
Cr-Commit-Position: refs/heads/main@{#1304621}
(cherry picked from commit abee3857ff039b52795aca02192598f636683b76)


[lensoverlay] Dynamic color extraction and theme resolution functions

1. Add function to extract vibrant or dominant color from an image.
This roughly follows the algorithm used in Omnient to first look for
the vibrant color, else the dominant color, provided the colors are
at minimum some chroma distance away from grayscale and are above a
minimum population.
2. Add function to find the closest matching color, given a
seed color (e.g. from above function) and a collection of colors.
If the given seed color does not have a valid chroma (e.g. grayscale), returns SK_ColorTRANSPARENT.
3. Utility color space conversion functions used for the above 2
functions.
4. Unit tests.

Bug: b/340358494
Change-Id: I07dcd5ab75188395e86f9feb821b546b05df6afd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5555338
Reviewed-by: Juan Mojica <juanmojica@google.com>
Commit-Queue: Kai Yu <kaiy@google.com>
Reviewed-by: Erik Chen <erikchen@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1304504}
(cherry picked from commit 07109602cc9d5bff85c5b4b0de71f4efb52140ab)


[lensoverlay] Disables URL-keyed suggestions

Bug: 332787629
Change-Id: I6e0262a310cf5221a0332d6f7a04bacc6fee8475
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5554148
Reviewed-by: Justin Donnelly <jdonnelly@chromium.org>
Code-Coverage: findit-for-me@appspot.gserviceaccount.com <findit-for-me@appspot.gserviceaccount.com>
Commit-Queue: Moe Ahmadi <mahmadi@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1304474}
(cherry picked from commit 469bbf2ab70b20271efdffe4736d6964edc63cc5)


[lensoverlay] Send REGION_SEARCH type instead of REGION

Bug: 342027294
Change-Id: I423f4d95b753a93ccab73da94728c85460095234
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5556561
Reviewed-by: Juan Mojica <juanmojica@google.com>
Commit-Queue: Jason Hu <hujasonx@google.com>
Cr-Commit-Position: refs/heads/main@{#1304275}
(cherry picked from commit 89c84a280b6bffffce8a9b6c861eaf79ee5d8870)


[lensoverlay] Redirect side panel to search URL on `/url` paths.

Change-Id: Ifc55791b834e2425044b3e2d1a93794500fd7939
Bug: b:339516044
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5554042
Reviewed-by: Jason Hu <hujasonx@google.com>
Auto-Submit: Juan Mojica <juanmojica@google.com>
Commit-Queue: Juan Mojica <juanmojica@google.com>
Cr-Commit-Position: refs/heads/main@{#1304186}
(cherry picked from commit 2cc133bc0054f513fde1eb3f769db8cd33caaea0)


[lensoverlay] Update segmentation masks for lighter backgrounds.

Demo: https://screencast.googleplex.com/cast/NTQzNTg0MTA4MDk4MzU1MnxmZGNmYWMyNS1mNw

Change-Id: I5a5ae7f277bda19842e39fd651fd87505a5d50fd
Bug: b:340357873
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5555849
Commit-Queue: Juan Mojica <juanmojica@google.com>
Reviewed-by: Jason Hu <hujasonx@google.com>
Cr-Commit-Position: refs/heads/main@{#1304165}
(cherry picked from commit 0e53e4ba81e1b79643d7432f1d750595da72d5d3)


[lensoverlay] Add colors for dark mode searchbox.

Adds dark mode colors into searchbox. The Google G icon will be fixed
in a follow up CL as that requires a new resource to be added.

https://screencast.googleplex.com/cast/Njc0MTExMzcyMDI3NDk0NHxlODZhZjhkMy1jZA

Bug: 338243804
Change-Id: Iedc74606d3eebbf769c79a4d9dc033bc15002d6f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5555264
Reviewed-by: Jason Hu <hujasonx@google.com>
Reviewed-by: Moe Ahmadi <mahmadi@chromium.org>
Commit-Queue: Nihar Majmudar <niharm@google.com>
Cr-Commit-Position: refs/heads/main@{#1304137}
(cherry picked from commit 699f7f635ca2c7fa230e543903edb4152c6d0eb9)


[lensoverlay] Add Lens footprints url param

Bug: 341339414
Change-Id: I0c5244ba52f3b403ba2466f105057ccd25cda28d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5555864
Reviewed-by: Juan Mojica <juanmojica@google.com>
Commit-Queue: Jason Hu <hujasonx@google.com>
Cr-Commit-Position: refs/heads/main@{#1304118}
(cherry picked from commit a76f63c9c19f5e0325391fcbf61998047d3cc7af)


Roll src/chrome/app/theme/google_chrome/ d9e6a8d9c..ee36936ba (1 commit)

https://chrome-internal.googlesource.com/chrome/theme/google_chrome.git/+log/d9e6a8d9c213..ee36936bac5f

Created with:
  roll-dep src/chrome/app/theme/google_chrome

Bug: 338243804
Change-Id: I5615d51cb93537fdf8ddff1b7015948ecbd18a85
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5554932
Commit-Queue: Moe Ahmadi <mahmadi@chromium.org>
Reviewed-by: Moe Ahmadi <mahmadi@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1304077}
(cherry picked from commit 4d39ebcb21a0fa3705eec120f34e3f63aa3250c8)


[lensoverlay] Add default scrim to overlay

Bug: 341773051
Change-Id: I3794d63e58f8c666957376d472b8a8170c716e10
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5547789
Reviewed-by: Juan Mojica <juanmojica@google.com>
Commit-Queue: Jason Hu <hujasonx@google.com>
Cr-Commit-Position: refs/heads/main@{#1303491}
(cherry picked from commit 21a4b746064214968cff524a334dd8aee603c95f)


[lensoverlay] Fix escape key not working sometimes

* Fix when the results iframe is focused
* Fix when the side panel is opened and there is no focused view

Bug: 341311178
Change-Id: I6232eaf1549a5114c007a66ee346bddfcbe827e4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5547788
Reviewed-by: Juan Mojica <juanmojica@google.com>
Commit-Queue: Jason Hu <hujasonx@google.com>
Cr-Commit-Position: refs/heads/main@{#1303476}
(cherry picked from commit c3c8c6d64826bbdd6a7696486c0247cb6e685444)


[lensoverlay] Adds darkMode WebUI loadtime boolean

To be used in the lens overlay and sidepanel WebUIs in follow-up CL(s).

The new utility file is added to "//chrome/browser/ui" build target as
adding it to "//chrome/browser/ui/lens" results in a dependency cycle:
//chrome/browser:browser ->
//chrome/browser/ui:ui ->
//chrome/browser/ui/lens:lens ->
//chrome/browser:browser

Bug: 341360519, 338243804
Change-Id: I4f56df41a054129d8c1fc8b3905fb0743df0a65c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5548754
Commit-Queue: Moe Ahmadi <mahmadi@chromium.org>
Code-Coverage: findit-for-me@appspot.gserviceaccount.com <findit-for-me@appspot.gserviceaccount.com>
Reviewed-by: Erik Chen <erikchen@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1303463}
(cherry picked from commit 98613cb7d3a1a12160466d99441e168d6b054b7d)


[lensoverlay] Update feature code to use new "Shown" histogram name.

Desktop.LensOverlay.Shown was renamed to Lens.Overlay.Shown in https://crrev.com/c/5546455. I thought I had changed the emit code to match in that CL but somehow missed it. This CL corrects that oversight.

Change-Id: I64f79ab0488867bde05b9abfec98e2a444976689
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5550572
Reviewed-by: Moe Ahmadi <mahmadi@chromium.org>
Code-Coverage: findit-for-me@appspot.gserviceaccount.com <findit-for-me@appspot.gserviceaccount.com>
Commit-Queue: Justin Donnelly <jdonnelly@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1303425}
(cherry picked from commit a45077fbc1aafd8e0c201a447e6aa4ce2cdcc438)


[lensoverlay] Add interactive ui test for permission bubble.

Bug: 338447409
Change-Id: I62ec6329b4f4b1ab1cfcd6e27679ac75f6eea373
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5529482
Reviewed-by: Moe Ahmadi <mahmadi@chromium.org>
Reviewed-by: Juan Mojica <juanmojica@google.com>
Commit-Queue: Nihar Majmudar <niharm@google.com>
Cr-Commit-Position: refs/heads/main@{#1303331}
(cherry picked from commit b8fb559fb034aae49a035b680bab7573dc1e8185)


[lensoverlay] Make searchbox resizable in side panel.

This makes the searchbox resizable as well as moves some searchbox size
logic from the realbox to its specific embedder (new tab page). Width
is capped at 768 px which matches CSC specs.

https://screencast.googleplex.com/cast/NTE3MjUzNzE0NjIxMjM1Mnw3MDE0MWY4NS00NA

Bug: 337935303
Change-Id: I0d5ef13151150ab50e658ec5b46b4db51926ed18
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5544722
Reviewed-by: Moe Ahmadi <mahmadi@chromium.org>
Commit-Queue: Nihar Majmudar <niharm@google.com>
Cr-Commit-Position: refs/heads/main@{#1303303}
(cherry picked from commit 36b2b342ec731049a036813c15a70c56f3a6305d)


[lens] Disable two tests on MSAN

Disable LensOverlayControllerCUJTest.OpenAndClose and
LensOverlayControllerCUJTest.EscapeKeyClose on MSAN.

Bug: 340343342
Change-Id: I781654d4e4af68bd7ca343f22c900c6a3a6caba8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5550751
Owners-Override: Dominik Röttsches <drott@chromium.org>
Auto-Submit: Dominik Röttsches <drott@chromium.org>
Commit-Queue: Dominik Röttsches <drott@chromium.org>
Reviewed-by: Philip Jägenstedt <foolip@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1303259}
(cherry picked from commit 816b2f96d751be5e797c74642a446ef457c81f10)


[lensoverlay][reland]Add cursor tooltip and update initial toast string

The original cl was reverted in
I28410d2998da1d1e96a0eaae8fd2199fb8fa174f, but for unrelated tests,
so this cl does not have any test fixes.

One thing this this cl changes from the original is that it hides the
tooltip when the cursor is hovering above a button at the top right.

Also, fixes a small issue where the mouse icon would appear in the top
left corner before moving to the mouse upon mouse move.

Demo: http://screencast/cast/NTQ1MTQ0NzIyMjE0MDkyOHwwYjY0NDFkMC1iNg

Bug: 337943205, 340285304
Change-Id: I8a34ca94300705f130abf76ac1d20fce5abc01a1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5548670
Commit-Queue: Jason Hu <hujasonx@google.com>
Reviewed-by: Bryan Nguyen <nguyenbryan@google.com>
Reviewed-by: Erik Chen <erikchen@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1303059}
(cherry picked from commit 13975a0be10898db85d3e792eba004815105207c)


[lensoverlay] Add dark mode param to search url

Bug: 340940924
Change-Id: If87c0ac31f96a9fc7e5d1ecae9f0ff2960d40ad8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5545732
Reviewed-by: Moe Ahmadi <mahmadi@chromium.org>
Commit-Queue: Jason Hu <hujasonx@google.com>
Reviewed-by: Erik Chen <erikchen@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1303001}
(cherry picked from commit 328fd587ff59399a3c3c6ea2781e2bc52482bc1b)


[lensoverlay] Fix tab dragging.

This CL makes 3 small changes:

(1) It exposes GetSessionID via BrowserWindowInterface. This allows
consumers of TabInterface to tell if a Tab has been moved to another
BrowserWindow. This is better than exposing observer methods on
TabInterface since there is a period of time when a Tab is not
associated with any BrowserWindow during tab dragging. Adding observer
methods would expose this implementation detail to Tab consumers, which
we want to avoid if possible.

(2) The implementation of lens overlay reparents the overlay widget if
the tab moves windows.

(3) The implementation of lens overlay resets `tab_contents_observer_`
while in the background.

(cherry picked from commit ed9455f052e94a4b8964ea8cd0a0c338756966b3)

Change-Id: I52af359ef9361df7379376f94e4693821f091259
Bug: b:340635929
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5541136
Commit-Queue: Erik Chen <erikchen@chromium.org>
Reviewed-by: Duncan Mercer <mercerd@google.com>
Cr-Original-Commit-Position: refs/heads/main@{#1301565}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5578213
Owners-Override: Srinivas Sista <srinivassista@chromium.org>
Commit-Queue: Srinivas Sista <srinivassista@chromium.org>
Reviewed-by: Rachel Blum <groby@chromium.org>
Cr-Commit-Position: refs/branch-heads/6478@{#772}
Cr-Branched-From: e6143acc03189c5e52959545b110d6d17ecd5286-refs/heads/main@{#1300313}