Upgrade from Chromium 93 to Chromium 94. #9558
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
24 tasks
mariospr
force-pushed
the
cr94
branch
2 times, most recently
from
82ce0bd
to
a9579c3
Compare
mariospr
force-pushed
the
cr94
branch
13 times, most recently
from
54b7233
to
4a98f3b
Compare
mariospr
force-pushed
the
cr94
branch
2 times, most recently
from
cba9ec8
to
2cf2e6b
Compare
mkarolin
requested review from
goodov,
iefremov,
samartnik,
simonhong and
a team
as code owners
…s.py fixes brave/brave-browser#17809 Related Chromium change https://source.chromium.org/chromium/chromium/src/+/0470f485e51e6ebb07cb96a64fd077fb3e5ff9ee : build: remove is_python2.py _is_python2 is always false now. Bug: 1112471 Change-Id: I049610e59c7f51472b6326a7fcdd82c732725cec
Upstream fully transitioned now to helper (Alerts) and removed XPC notification service. We should no longer mess with the identifier for that executable. See original change: #8755 See upstream: https://bugs.chromium.org/p/chromium/issues/detail?id=1170731
Roll back some of the changes done in the prior commit with the same title (minus II) due to a revert upstream. Chromium change: https://chromium.googlesource.com/chromium/src.git/+/54772f307e724 commit 54772f307e724e8d2cb00a443027e9e0c1be202d Author: Ali Beyad <abeyad@chromium.org> Date: Tue Aug 31 15:27:44 2021 +0000 Merge to M94 branch: Revert "Add Sec-CH-UA-Reduced client hint header when Origin Trial token present" This reverts commit 7417fc2bd5c8cf0e6dbf7ca4b599603c67d3edf3 (CL on Gerrit: https://chromium-review.googlesource.com/c/chromium/src/+/3064532). This revert is only applied on the M94 branch. The reason for the revert is that the User-Agent Reduction Origin Trial was only partially implemented by the time the M94 branch was cut. We want to revert the Origin Trial changes because we don't want a user on M94 visiting a site that is participating in the Origin Trial to get a half-baked or undefined implementation behavior. For this change being reverted, we would've ended up sending Sec-CH-UA-Reduced without sending a reduced User-Agent string in the request header. Chrome feature: https://chromestatus.com/feature/5704553745874944 Bug: 1245043
This was initially needed as per some changes that were going to be added as part of PR #8124[1] (in commit 8ba9ddb[2]), that used util::WallClockTimer, but the merged PR ended up implementing things differently and this dependency was left around in the BUILD.gn file. Since //base/util/timer does not exist anymore in Chromium 94 (i.e it has been moved to //base/timer), this is breaking the build now so let's remove the stray dependency. [1] #8124 [2] 8ba9ddb5
Chromium change: https://source.chromium.org/chromium/chromium/src/+/f60c8d2b2478e42fe420cb5012e304d72f1f2613 commit f60c8d2b2478e42fe420cb5012e304d72f1f2613 Author: Albert J. Wong <ajwong@chromium.org> Date: Tue Jul 27 07:25:26 2021 +0000 Merge //base/util/values into //base/json This is part of merging all of //base/util back into //base. Bug: 1227210
Even though //tools/gritsettings/resource_ids.spec claims that ids of 31000+ are reserved for project built on top of Chromium, their own ids no longer stay under that number. I was getting a DCHECK of collision of our ids in brave_components_resources.pak with Chromium's resources.pak. Shifted our IDs to start from 38000.
Uncaught SyntaxError: The requested module '../appearance_page/appearance_browser_proxy.js' does not provide an export named 'AppearanceBrowserProxy'
Upstream added another element with `if=...pageVisibility.privacy` attribute so our getSectionElement function ended up picking the wrong one. Adjusted the function to prefer `if=[[showPage_(...` attribute over other conditionals. Chromium change: https://chromium.googlesource.com/chromium/src.git/+/6ad96baa commit 6ad96baaf19c658abd8ccacf24ec27485337046c Author: Bret Sepulveda <bsep@chromium.org> Date: Mon Aug 9 16:15:40 2021 +0000 Privacy Review: promo card element This patch adds the promo card polymer element with the correct styling and a button that begins the review flow when clicked. As of this patch, the promo is always shown when the flag is enabled. Bug: 1215630
This reverts commit 0b78f9e, reversing changes made to d260b6a. Reverting because upstream has fixed the first run regression via: https://chromium.googlesource.com/chromium/src.git/+/f9385e0d893916cbb16b477bdec127e56f9897da Cherry-picked into cr94 as https://chromium.googlesource.com/chromium/src/+/3f20e2edeb0adf78a6a9a6208e2e02ad3c7d8810 commit f9385e0d893916cbb16b477bdec127e56f9897da Author: Caitlin Fischer <caitlinfischer@google.com> Date: Mon Aug 30 13:31:02 2021 +0000 Ignore Local State when deciding whether to show the first run dialog. The bug was caused by an experiment that causes Local State to be written to disk during startup (before the first-run-dialog-showing logic is reached) on some clients. Since Local State existed on some clients, the dialog was not shown. However, the first-run-dialog-showing logic should not depend on the presence or absence of a Local State file. This change affects some POSIX platforms running Google Chrome for the first time. This logic being removed was originally added here: https://chromiumcodereview.appspot.com/14946003/. Bug: 1221483
Seems to be only causing a problem on MacOS. On other platforms rollup finds our files, but on MacOS it doesn't: [!] Error: Could not resolve './brave_overrides/index.js' from gen/chrome/browser/resources/settings/tsc/settings.js Upstream is picking up files from tsc folder now for rollup, so it seems that's where we should drop ours. Chromium change: https://source.chromium.org/chromium/chromium/src/+/36d4bff7cb074ec08a3097f0b05eb375bfd04087 Author: dpapad <dpapad@chromium.org> Date: Fri Jul 30 09:23:37 2021 +0000 Settings: Migrate to TypeScript compiler, still using JS. Bug: 1234307
|
Rebased on master and squashed fixup commits |
mkarolin
added a commit
that referenced
this pull request
Sep 14, 2021
Upgrade from Chromium 93 to Chromium 94.
24 tasks
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.
Fixes brave/brave-browser#17170
Related PR: brave/brave-browser#17171
Submitter Checklist:
QA/YesorQA/No;release-notes/includeorrelease-notes/exclude;OS/...) to the associated issuenpm run test -- brave_browser_tests,npm run test -- brave_unit_tests,npm run lint,npm run gn_check,npm run tslintgit rebase master(if needed)Reviewer Checklist:
gnAfter-merge Checklist:
changes has landed on
Test Plan: