Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade from Chromium 118 to Chromium 119 (1.60.x) #20654

Merged
merged 9 commits into from
Oct 26, 2023
Merged

Upgrade from Chromium 118 to Chromium 119 (1.60.x) #20654

merged 9 commits into from
Oct 26, 2023

Conversation

emerick
Copy link
Contributor

@emerick emerick commented Oct 24, 2023 •
edited
Loading

Resolves brave/brave-browser#33274
Uplift from #20314

Uplift from #20396

Resolves brave/brave-browser#33358
Uplift from #20440

Resolves brave/brave-browser#33746
Uplift from #20598

Resolves brave/brave-browser#32876
Uplift from #20329

Resolves brave/brave-browser#33411
Uplift from #20390

Resolves brave/brave-browser#33839
Uplift from #20642

Resolves brave/brave-browser#33886
Uplift from #20664

Resolves brave/brave-browser#33882
Uplift from #20665

Submitter Checklist:

  • I confirm that no security/privacy review is needed and no other type of reviews are needed, or that I have requested them
  • There is a ticket for my issue
  • Used Github auto-closing keywords in the PR description above
  • Wrote a good PR/commit description
  • Squashed any review feedback or "fixup" commits before merge, so that history is a record of what happened in the repo, not your PR
  • Added appropriate labels (QA/Yes or QA/No; release-notes/include or release-notes/exclude; OS/...) to the associated issue
  • Checked the PR locally:
    • npm run test -- brave_browser_tests, npm run test -- brave_unit_tests wiki
    • npm run lint, npm run presubmit wiki, npm run gn_check, npm run tslint
  • Ran git rebase master (if needed)

Reviewer Checklist:

  • A security review is not needed, or a link to one is included in the PR description
  • New files have MPL-2.0 license header
  • Adequate test coverage exists to prevent regressions
  • Major classes, functions and non-trivial code blocks are well-commented
  • Changes in component dependencies are properly reflected in gn
  • Code follows the style guide
  • Test plan is specified in PR before merging

After-merge Checklist:

Test Plan:

@emerick emerick added this to the 1.60.x - Beta milestone Oct 24, 2023
@emerick emerick self-assigned this Oct 24, 2023
@emerick emerick requested a review from a team as a code owner October 24, 2023 14:16
@github-actions github-actions bot added CI/run-network-audit Run network-audit CI/run-audit-deps Check for known npm/cargo vulnerabilities (audit_deps) potential-layer-violation-fixes This PR touches a BUILD.gn file with check_includes=false CI/storybook-url Deploy storybook and provide a unique URL for each build CI/run-upstream-tests Run upstream unit and browser tests on Linux and Windows (otherwise only on Linux) feature/web3/wallet feature/web3/wallet/core labels Oct 24, 2023
@brave-builds
Copy link
Collaborator

A Storybook has been deployed to preview UI for the latest push

@brave-builds
Copy link
Collaborator

A Storybook has been deployed to preview UI for the latest push

@emerick emerick force-pushed the cr119-1.60.x branch 2 times, most recently from 61f6ae8 to 9c51985 Compare October 24, 2023 18:57
@brave-builds
Copy link
Collaborator

A Storybook has been deployed to preview UI for the latest push

@brave-builds
Copy link
Collaborator

A Storybook has been deployed to preview UI for the latest push

AlexeyBarabash and others added 7 commits October 25, 2023 05:03
@AlexeyBarabash @DJAndries @emerick
Enable History datatype for Sync (#20329)
5229870 
* Reverted PR#16705 (Sync all history)

* Reverted PR#16478 (Display history sync diagnostic info)

* Reverted PR#20071 (Disable history sync datatype to fallback to typed urls datatype)

* Added overrides for HistoryModelTypeController and HistoryDeleteDirectivesModelTypeController to work
when encrypt everything option is on

* Add patch to sync history delete directives and history entities together

* Added unit test for LowPriorityUserTypes

* Enable encryption of history sync entities

* Added test for precondition state of history datatype controllers

* Modified: clean out HistoryDeleteDirectiveSpecifics::UrlDirective::url field, as it is unencrypted

* Added test to ensure we don't send url at HistoryDeleteDirectiveSpecifics::UrlDirective

* Modified ModelTypeTest.EncryptableUserTypes test to check History type

* Removed 'path_excludes' for the files removed in the current PR

---------

Co-authored-by: Darnell Andries <dandries@brave.com>
@Brandon-T @emerick
Fix #33746: Cleanup Brave-Core iOS chromium_src overrides & initializ…
c69dfd2 
…ation code (#20598)

- Cleanup Brave-Core IOS Chromium_SRC overrides.
- Add new cleaner Chromium_SRC overrides and simplify app launch logic.
@arthuredelstein @emerick
Don't redefine static_assert (#20440)
d9b604e 
(Instead, we make sure the static_assert passes here by locally restoring
kCoarseResolutionMicroseconds back to its original Chromium value.)
@cdesouza-chromium @emerick
Use PrefService with MigrateObsoleteProfilePrefs (#20396)
cc3a2b4 
Upstream is changing `MigrateObsoleteProfilePrefs` to take a
`PrefService` pointer, rather than `Profile`, as this is more expressive
of the data actually being accessed.

This change aligns all places where we have procedures similar to
`MigrateObsoleteProfilePrefs`, to receive a `PrefService*` instance as
well.

Chromium change:
https://chromium.googlesource.com/chromium/src/+/d848587fe1f19123940de4e4c0cec328bc23001f

commit d848587fe1f19123940de4e4c0cec328bc23001f
Author: Mikel Astiz <mastiz@chromium.org>
Date:   Mon Oct 2 09:28:03 2023 +0000

    [sync] Remove legacy SyncRequested pref

    It has been practically unused for some time, and most of it is dead
    code ever since the feature toggle was cleaned up in
    https://crrev.com/c/4886256.

    On Ash, it needs to be migrated to a newly-introduced preference
    tailored to the actual underlying need, which is being able to remember
    that the server returned DISABLE_SYNC_ON_CLIENT (i.e. the user reset
    sync via dashboard).

    Change-Id: I0239447173b32d7d007ebf733dde23a5de1859e1
    Bug: 1443446, 1219990
@cdesouza-chromium @emerick
Ignore formatting for crates under third_party (#20390)
4d48714 
This changes adds a patch to add brave's own third party crates path to
the list of rust paths to be ignored during formatting.
@soner-yuksel @emerick
Merge pull request #20642 from brave/ios/bugfix/sync_all_history
21deace
@emerick
Merge pull request #20664 from brave/cr119-followup-disable-power-boo…
4caa81a 
…kmarks

Disable kPowerBookmarksSidePanel feature flag
@emerick emerick force-pushed the cr119-1.60.x branch 2 times, most recently from 6f9fe95 to d8e21e4 Compare October 25, 2023 09:52
@brave-builds
Copy link
Collaborator

A Storybook has been deployed to preview UI for the latest push

@brave-builds
Copy link
Collaborator

A Storybook has been deployed to preview UI for the latest push

@samartnik @emerick
[Android] Fix for private tab badge padding
9540b83 
Chromium change:
https://source.chromium.org/chromium/chromium/src/+/37d04b2089c15cb152a8a559887a7d10c66572be

[APS] Update tooltip visibility and remove hover highlight for StatusView

- Remove tooltip when StatusIconView is not visible.
- remove hover highlight when StatusIconView is not visible(e.g. default engine is not Google).
- remove hover highlight when VerboseStatusText is visible(e.g. offline).

demo(default engine not Google): https://drive.google.com/file/d/1DPIhHtWN4RnjPvkysyCSfV_gd73ZMjPb/view?usp=sharing

demo(offline)
https://drive.google.com/file/d/1-1Y_t59i8AcxFv6sLpBE-kG2tsSGoi4s/view?usp=sharing

TODO: relocate the logic in StatusView to StatusViewBinder or StatusProperties.

Bug: 1476816, 1476802
@emerick
Merge pull request #20314 from brave/cr119
395968f 
Upgrade from Chromium 118 to Chromium 119
@brave-builds
Copy link
Collaborator

A Storybook has been deployed to preview UI for the latest push

1 similar comment
@brave-builds
Copy link
Collaborator

A Storybook has been deployed to preview UI for the latest push

@soner-yuksel soner-yuksel mentioned this pull request Oct 25, 2023
Merged
11 tasks
kjozwiak
kjozwiak approved these changes Oct 26, 2023
View reviewed changes
Copy link
Member

@kjozwiak kjozwiak left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Uplift into 1.60.x approved 👍

@kjozwiak kjozwiak merged commit 8b2b815 into 1.60.x Oct 26, 2023
12 checks passed
@kjozwiak kjozwiak deleted the cr119-1.60.x branch October 26, 2023 20:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kjozwiak kjozwiak kjozwiak approved these changes

Assignees

@emerick emerick

Labels
CI/run-audit-deps Check for known npm/cargo vulnerabilities (audit_deps) CI/run-network-audit Run network-audit CI/run-upstream-tests Run upstream unit and browser tests on Linux and Windows (otherwise only on Linux) CI/storybook-url Deploy storybook and provide a unique URL for each build feature/web3/wallet/core feature/web3/wallet potential-layer-violation-fixes This PR touches a BUILD.gn file with check_includes=false
Projects
None yet
Milestone
1.60.x - Release
Development

Successfully merging this pull request may close these issues.
9 participants
@emerick @brave-builds @kjozwiak @AlexeyBarabash @Brandon-T @arthuredelstein @cdesouza-chromium @soner-yuksel @samartnik