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 113 to Chromium 114 #17965

Merged
merged 119 commits into from
May 15, 2023
Merged

Upgrade from Chromium 113 to Chromium 114 #17965

merged 119 commits into from
May 15, 2023

Conversation

cdesouza-chromium
Copy link
Collaborator

@cdesouza-chromium cdesouza-chromium commented Apr 7, 2023 •
edited
Loading

Resolves brave/brave-browser#29600
Resolves brave/brave-browser#29533

Submitter Checklist:

  • I confirm that no security/privacy review is needed, or that I have requested one
  • 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:

@github-actions github-actions bot added CI/run-audit-deps Check for known npm/cargo vulnerabilities (audit_deps) CI/run-network-audit Run network-audit CI/storybook-url Deploy storybook and provide a unique URL for each build feature/web3/wallet feature/web3/wallet/core potential-layer-violation-fixes This PR touches a BUILD.gn file with check_includes=false labels Apr 7, 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

@brave-builds
Copy link
Collaborator

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

@emerick emerick added the CI/run-upstream-tests Run upstream unit and browser tests on Linux and Windows (otherwise only on Linux) label Apr 11, 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

@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

@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

@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

@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

@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 and others added 12 commits May 15, 2023 11:02
@emerick
Conflict-resolved patches from Chromium 114.0.5735.9 to Chromium 114.…
b63103b 
…0.5735.16
@emerick
Update patches from Chromium 114.0.5735.9 to Chromium 114.0.5735.16
223da8c
@emerick
Updated strings for Chromium 114.0.5735.16
59b1d45
@emerick
http_interstitial_enabled_ was renamed to http_interstitial_enabled_b…
b424d16 
…y_pref_

Chromium change:

https://source.chromium.org/chromium/chromium/src/+/af795e6b1da2e574807be6b8fc2ac2d49fc0be28

commit af795e6b1da2e574807be6b8fc2ac2d49fc0be28
Author: Mustafa Emre Acer <meacer@chromium.org>
Date:   Tue May 2 21:45:38 2023 +0000

    [Merge 114] HTTPS-First Mode: Enable Site Engagement heuristic with metrics

    This CL implements Site Engagement Heuristic to enable HTTPS-First Mode
    on sites that the user interacts with regularly. If the engagement
    score of the HTTPS URL of a host goes above a certain threshold, HFM
    is enabled on that host. Presently, this CL only records a new histogram
    with the same events as HFM.

    The current thresholds for engagement scores are arbitrary and will be
    tweaked in future CLs. This CL also only enables HFM for a site, but
    doesn't remove it. This will be implemented in future CLs.

    (cherry picked from commit ee7cf748caf24937bd585ee35adb6e8dd5a7cfe1)

    Bug: 1435222
@emerick
Adapt to changes in HttpsUpgradesNavigationThrottle::MaybeCreateThrot…
3c738f1 
…tleFor

Chromium change:

https://source.chromium.org/chromium/chromium/src/+/af795e6b1da2e574807be6b8fc2ac2d49fc0be28

commit af795e6b1da2e574807be6b8fc2ac2d49fc0be28
Author: Mustafa Emre Acer <meacer@chromium.org>
Date:   Tue May 2 21:45:38 2023 +0000

    [Merge 114] HTTPS-First Mode: Enable Site Engagement heuristic with metrics

    This CL implements Site Engagement Heuristic to enable HTTPS-First Mode
    on sites that the user interacts with regularly. If the engagement
    score of the HTTPS URL of a host goes above a certain threshold, HFM
    is enabled on that host. Presently, this CL only records a new histogram
    with the same events as HFM.

    The current thresholds for engagement scores are arbitrary and will be
    tweaked in future CLs. This CL also only enables HFM for a site, but
    doesn't remove it. This will be implemented in future CLs.

    (cherry picked from commit ee7cf748caf24937bd585ee35adb6e8dd5a7cfe1)

    Bug: 1435222
@emerick
Disable features flagged by privacy/security team
d556348
@emerick
Include br_shared_style.cs dependency for settings radio button
8982bf6 
We patch settings_shared.css to override the styles of various controls in
brave://settings. This upstream change removed settings_shared.css in a few
places and resulted in radio buttons reverting to their default (non-Brave)
style. This patch includes br_shared_style.css in cr_radio_button_style.css to
continue overriding the default style for radio buttons.

Chromium change:

https://source.chromium.org/chromium/chromium/src/+/7bd64db63faec8ecf57151f387c6939828272df2

commit 7bd64db63faec8ecf57151f387c6939828272df2
Author: dpapad <dpapad@chromium.org>
Date:   Mon Apr 17 22:52:58 2023 +0000

    Settings: Remove settings_shared.css dependency from controls/

    This is in preparation of moving controls/ to the "limited sharing"
    mechanism so that they can be properly shared with CrOS Settings.

    The dependency was either not needed, or it was needed for very few
    styles that could be achieved otherwise.

    By removing the dependency, hoping to not have to move all of settings_shared.css to c/b/r/settings_shared/, as this file is
    probably better forked between CrOS and Browser settings.

    Bug: 1431477
@cdesouza-chromium @emerick
Update from Chromium 114.0.5735.16 to Chromium 114.0.5735.26.
886ef7c
@cdesouza-chromium @emerick
Conflict-resolved patches from Chromium 114.0.5735.16 to Chromium 114…
82c8abe 
….0.5735.26.
@cdesouza-chromium @emerick
Update patches from Chromium 114.0.5735.16 to Chromium 114.0.5735.26.
f2fabb5
@cdesouza-chromium @emerick
Updated strings for Chromium 114.0.5735.26.
6891f6f
@samartnik @emerick
[Android] Switch bookmarks to use DragReorderableRecyclerViewAdapter
8ad7a9d 
Chromium change:
chromium/chromium@2f7edb2

Switch bookmarks to use DragReorderableRecyclerViewAdapter.
The new adapter extends SimpleRecyclerViewAdapter, bringing the
bookmarks code significantly closer to correct MVC. The SRVA invokes
all of the correct and most narrow RecyclerView.Adapter notifications,
allowing us to drop all explicit #notifyDataSetChanged calls.

There was some problems with preventing flicker on model changes, which
were overcome with #setSupportsChangeAnimations(false) and #updateOrAdd.

This is also the first use case to actually integrate with
DragReorderableRecyclerViewAdapter and some changes were needed.
* We need per-row control over draggability, not just per-type.
* Removed explicit swap impl, as ListModelBase#move is sufficient.

Bug: 1413463
@brave-builds
Copy link
Collaborator

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

@emerick emerick merged commit 9caca49 into master May 15, 2023
@emerick emerick deleted the cr114 branch May 15, 2023 21:04
@github-actions github-actions bot added this to the 1.53.x - Nightly milestone May 15, 2023
@github-actions github-actions bot removed the potential-layer-violation-fixes This PR touches a BUILD.gn file with check_includes=false label May 15, 2023
emerick added a commit that referenced this pull request May 17, 2023
@emerick
Merge pull request #17965 from brave/cr114
cc12df4 
Upgrade from Chromium 113 to Chromium 114
kjozwiak pushed a commit that referenced this pull request May 21, 2023
@emerick @atuchin-m @kylehickinson
Merge pull request #17965 from brave/cr114 (#18495)
15ed506 
* Merge pull request #17965 from brave/cr114

Upgrade from Chromium 113 to Chromium 114

* [iOS] Fix browser prefs patch (cr114 follow-up)

* Fix spacing in "On Exit" tab in Clear browsing data modal

Chromium change:

https://source.chromium.org/chromium/chromium/src/+/9c9fb19befc6b3417df2ccd033cf7bb3774d1d59

commit 9c9fb19befc6b3417df2ccd033cf7bb3774d1d59
Author: dpapad <dpapad@chromium.org>
Date:   Wed Apr 19 15:28:38 2023 +0000

    Settings: Remove more CSS variables from settings_vars.css.

    Replacing
     1) --settings-row-min-height with --cr-section-min-height
     2) --settings-row-two-line-min-height with
        --cr-section-two-line-min-height

    The settings variables seem unnecessary since they almost always mirror
    the value of the WebUI-wide ones.

    Bug: 1431477

* Fix --user-agent=<something> switch (#18530)

* Fix --user-agent=<something> switch
* Fix gn check

* [iOS] Fix crash on launch due to moved IOThread init

* [iOS] Attach IOSTaskTabHelper to WebState to fix crash on sync

* [iOS] Add unique identifier to session storage manager

---------

Co-authored-by: Mikhail <matuchin@brave.com>
Co-authored-by: Kyle Hickinson <git@kylehickinson.com>
@fmarier fmarier mentioned this pull request Jun 9, 2023
Closed
@ghost ghost mentioned this pull request Aug 7, 2023
Closed
bridiver
bridiver reviewed May 8, 2024
View reviewed changes
chromium_src/chrome/browser/ssl/https_upgrades_navigation_throttle.cc
(base::FeatureList::IsEnabled(features::kHttpsFirstModeV2) && prefs &&
prefs->GetBoolean(prefs::kHttpsOnlyModeEnabled)) ||
brave_shields::ShouldForceHttps(map, request_url);

StatefulSSLHostStateDelegate* state =
Copy link
Collaborator

Choose a reason for hiding this comment

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

I don't think these changes are correct. In particular StatefulSSLHostStateDelegate was left out of the original implementation and since we copied code (which we should almost never do) without any comments, it's not clear what the intention was, but now it's not clear at all what should be controlling this. This is a global pref for chromium, but it's a site setting for us so I think these other changes confuse what the actual setting is

Copy link
Collaborator

Choose a reason for hiding this comment

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

This whole thing is very confusing imo. If we want one behavior when IsHttpsByDefaultFeatureEnabled is enabled and the default chromium behavior when it's not, then we should always be deferring to the original chromium method, not copying the code here

Copy link
Contributor

Choose a reason for hiding this comment

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

I can't recall why it was done this way, but I agree it doesn't seem ideal. I can enter an issue for this, but would probably need advice from someone like @arthuredelstein as far as how it should work.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mkarolin mkarolin mkarolin approved these changes

@emerick emerick emerick left review comments

@bridiver bridiver bridiver approved these changes

@antonok-edm antonok-edm antonok-edm approved these changes

@darkdh darkdh darkdh approved these changes

@zenparsing zenparsing zenparsing approved these changes

@fmarier fmarier fmarier approved these changes

@DJAndries DJAndries DJAndries approved these changes

@kylehickinson kylehickinson kylehickinson approved these changes

@AlexeyBarabash AlexeyBarabash AlexeyBarabash approved these changes

@iefremov iefremov iefremov approved these changes

@Brandon-T Brandon-T Brandon-T approved these changes

@tmancey tmancey tmancey approved these changes

@goodov goodov goodov approved these changes

@bsclifton bsclifton bsclifton approved these changes

Assignees

@emerick emerick

@samartnik samartnik

@cdesouza-chromium cdesouza-chromium

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
Projects
None yet
Milestone
1.56.x - Release
Development

Successfully merging this pull request may close these issues.

Upgrade from Chromium 113 to Chromium 114 [ios] Correct deprecated SecCertificate for iOS 14