chore: cherry-pick 3b5f65c0aeca from chromium #25859
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ppontes
force-pushed
the
cherry-pick/9-x-y/chromium/3b5f65c0aeca
branch
from
72465f7 to
249533d
Compare
nornagon
approved these changes
Oct 9, 2020
ppontes
force-pushed
the
cherry-pick/9-x-y/chromium/3b5f65c0aeca
branch
2 times, most recently
from
2dad661 to
95dc5d6
Compare
zcbenz
reviewed
Oct 13, 2020
patches/chromium/.patches
Outdated
| @@ -137,6 +137,5 @@ backport_1122684.patch | |||
| backport_1111737.patch | |||
| cherry-pick-0e61c69ebd47.patch | |||
| cherry-pick-814a27f8522b.patch | |||
| cherry-pick-adc731d678c4.patch | |||
There was a problem hiding this comment.
Why are these patches removed?
There was a problem hiding this comment.
Great catch, @zcbenz , this was probably the result of an interactive rebase of the patch commit log in the Chromium source gone wrong. Fixed.
ppontes
force-pushed
the
cherry-pick/9-x-y/chromium/3b5f65c0aeca
branch
from
702ac0e to
95f60d4
Compare
zcbenz
approved these changes
Oct 14, 2020
|
Release Notes Persisted
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
[m85] Reland "Add more checks for chrome.debugger extensions"
TBR=rdevlin.cronin@chromium.org
This reverts commit 5a809a08fd5ca32cb8d594664416db2f2dc8ebdc.
Reason for revert: I don't think the test failure is related. Please note it stopped before the revert landed (build no 91007 vs. 91010). This must have been a flake, or a independent failure that has been fixed by one of the front-end rolls.
Original change's description:
TBR=dgozman@chromium.org,rdevlin.cronin@chromium.org,caseq@chromium.org,yangguo@chromium.org,sigurds@chromium.org,dullweber@chromium.org
(cherry picked from commit a064db74c8734fbf47de2f3a3503832514857173)
(cherry picked from commit 9940472e708a4003aee9edf9da42d68fde591e08)
Bug: 1113558
Bug: 1113565
Change-Id: Ic98fc037028a210204b7935b0b8e50e4e36e2397
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2368446
Reviewed-by: Andrey Kosyakov caseq@chromium.org
Commit-Queue: Andrey Kosyakov caseq@chromium.org
Cr-Original-Original-Commit-Position: refs/heads/master@{#800682}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2398884
Cr-Original-Commit-Position: refs/branch-heads/4240@{#506}
Cr-Original-Branched-From: f297677702651916bbf65e59c0d4bbd4ce57d1ee-refs/heads/master@{#800218}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2419133
Cr-Commit-Position: refs/branch-heads/4183@{#1863}
Cr-Branched-From: 740e9e8a40505392ba5c8e022a8024b3d018ca65-refs/heads/master@{#782793}
Notes: Security: backported fix for 1113558.