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.

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

Upgrade from Chromium 104 to Chromium 105. #13946

Merged
merged 146 commits into from
Aug 23, 2022
Merged

Upgrade from Chromium 104 to Chromium 105. #13946

merged 146 commits into from
Aug 23, 2022

Conversation

cdesouza-chromium
Copy link
Collaborator

@cdesouza-chromium cdesouza-chromium commented Jun 24, 2022

Resolves brave/brave-browser#23800

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, npm run lint, 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:

@cdesouza-chromium cdesouza-chromium added CI/run-network-audit Run network-audit CI/run-audit-deps Check for known npm/cargo vulnerabilities (audit_deps) CI/run-draft CI/storybook-url Deploy storybook and provide a unique URL for each build labels Jun 24, 2022
@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

mkarolin and others added 17 commits August 23, 2022 00:19
The implementation has been rolled into base/check.cc

Chromium change:

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

commit ae771d5e5f53750982036a5aee7088e4d2e6017d
Author: Peter Boström <pbos@chromium.org>
Date:   Fri Jul 15 18:48:05 2022 +0000

    Reland "Reland "Update NOTREACHED() macro to dump once on ash""

    This reverts commit 78a16418ffb133b4dda77bb78bcbadc4ffa56e57.

    Reason for revert: Third time's the charm?

    Original change's description:
    > Revert "Reland "Update NOTREACHED() macro to dump once on ash""
    >
    > This reverts commit a49185f54a399e0942ed93e2a57119d99aef71a0.
    >
    > Reason for revert: Still failing on linux-chromeos-rel
    > Example:
    > https://ci.chromium.org/ui/p/chromium/builders/ci/linux-chromeos-rel/57998/test-results
    >
    > Original change's description:
    > > Reland "Update NOTREACHED() macro to dump once on ash"
    > >
    > > This reverts commit 0936342e1f6be815cc2476e67a6b76baf6f21eaa.
    > >
    > > Reason for revert: Relanding with updated test expectations.
    > >
    > > Original change's description:
    > > > Revert "Update NOTREACHED() macro to dump once on ash"
    > > >
    > > > This reverts commit 0877630af0544722fad407c4966a64af8c7fa2c3.
    > > >
    > > > Reason for revert: CheckTest.NotReached test consistently failing.
    > > >
    > > > First failure:
    > > > https://ci.chromium.org/ui/p/chromium/builders/ci/chromeos-amd64-generic-rel/65871/overview
    > > >
    > > > Original change's description:
    > > > > Update NOTREACHED() macro to dump once on ash
    > > > >
    > > > > It's not immediately obvious that ash will get DCHECK_IS_CONFIGURABLE
    > > > > builds, so this provides some extra NOTREACHED() information for
    > > > > non-DCHECK builds where NOTREACHED()s are not optimized out but are
    > > > > logged anyways.
    > > > >
    > > > > This adds DCheckDumpOnceWithoutCrashing support to NOTREACHED() under
    > > > > the gn arg `enable_log_error_not_reached`.
    > > > >
    > > > > For other release builds (including official non-DCHECK builds) this is
    > > > > optimized away through EAT_CHECK_STREAM_PARAMS().
    > > > >
    > > > > notreached.cc is removed in favor of using CheckError and friends.
    > > > > NOTREACHED() as a macro should probably move into perhaps check.h.
    > > > >
    > > > > Bug: 596231
../../brave/vendor/bat-native-ads/src/bat/ads/internal/account/utility/redeem_unblinded_token/create_confirmation_util.cc(52,36): error: call to deleted constructor of 'base::Value::Dict'
    confirmation_request_dto.Merge(std::move(user_data->GetDict()));
                                   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../..\base/values.h(377,5): note: 'Dict' has been explicitly marked deleted here
    Dict(const Dict&) = delete;
    ^
../..\base/values.h(444,21): note: passing argument to parameter 'dict' here
    void Merge(Dict dict);
                    ^
1 error generated.
These tests pass locally, but crash on x86 CI.
We change colors so this is not expected to work.
Applied upstream changes https://source.chromium.org/chromium/chromium/src/+/405506fdd359e49f8c741f4483164f1d62bb447f
to fix build warning:

../../chrome/android/java/src/org/chromium/chrome/browser/share/ShareDelegateImpl.java:265: Warning: This method should only be accessed from tests or within private scope [VisibleForTests]
             if (profile == null || !profile.isNativeInitialized()) {
                                             ~~~~~~~~~~~~~~~~~~~
0 errors, 1 warnings (613 errors, 237 warnings filtered by baseline lint-baseline.xml)

Chromium change:
chromium/chromium@4ec45d2

[SharingHub] Add Profile fallback and null-check back.
Sometimes Profile.ProfileSupplier is unexpectedly returning null, so
add the null-check back so it doesn't cause crashes.

(cherry picked from commit 5ad5f44)

Bug: 1346710
Replaces commenting out with line by line patching.
@brave-builds
Copy link
Collaborator

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

Just added the necessary code to compile. No implementation fo the
feature for Brave side panel.

Chromium change:

https://source.chromium.org/chromium/chromium/src/+/1183a7f341a2c95040f3677ed052ab1609ca22d3

commit 1183a7f341a2c95040f3677ed052ab1609ca22d3
Author: dljames <dljames@google.com>
Date:   Tue Jul 19 19:09:18 2022 +0000

    [Side Panel] Side switch feature implementation.

    Implementation of the side switch feature for side panel.
    This implementation works with the recently added side panel prefs.
    Also supports RTL side switching.

    Change-Id: I59e260aaabd38cb324fc956ba398e100dd00022a
    Bug: 1318892
@brave-builds
Copy link
Collaborator

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

@mkarolin mkarolin merged commit a22d340 into master Aug 23, 2022
@mkarolin mkarolin deleted the cr105 branch August 23, 2022 17:36
@github-actions github-actions bot added this to the 1.44.x - Nightly milestone Aug 23, 2022
mkarolin added a commit that referenced this pull request Aug 24, 2022
Upgrade from Chromium 104 to Chromium 105.
mkarolin added a commit that referenced this pull request Aug 25, 2022
Upgrade from Chromium 104 to Chromium 105.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Upgrade from Chromium 104 to Chromium 105.