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

Canary #17450

Draft
wants to merge 197 commits into
base: master
Choose a base branch
from
Draft

Canary #17450

wants to merge 197 commits into from

Conversation

cdesouza-chromium
Copy link
Collaborator

Resolves

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 labels Mar 2, 2023
@cdesouza-chromium cdesouza-chromium force-pushed the canary branch 2 times, most recently from fe640c8 to 7b3bfc0 Compare March 6, 2023 15:48
@cdesouza-chromium cdesouza-chromium force-pushed the canary branch 6 times, most recently from ccdfe5e to fe2c18c Compare March 15, 2023 15:45
@cdesouza-chromium cdesouza-chromium force-pushed the canary branch 4 times, most recently from 7a0d373 to b3dcdf1 Compare March 29, 2023 08:32
@cdesouza-chromium cdesouza-chromium force-pushed the canary branch 5 times, most recently from 5570187 to 6c5ec04 Compare April 28, 2023 10:31
@cdesouza-chromium cdesouza-chromium force-pushed the canary branch 3 times, most recently from cc9efb3 to 8333203 Compare May 25, 2023 14:37
@mihaiplesa mihaiplesa added the CI/skip Do not run CI builds (except noplatform) label Jun 9, 2023
cdesouza-chromium and others added 29 commits December 26, 2024 20:39
Recent changes to `gnrt` are providing better specs to how to identify a
given license. This has run over the existing patch in place for the
additions Brave has in place.

This change reorganises the existing patch to work along the new system.

Chromium change:
https://chromium.googlesource.com/chromium/src/+/809c3c70721dbdd35dea12e3b66c66cc9881a4e9

commit 809c3c70721dbdd35dea12e3b66c66cc9881a4e9
Author: Jordan <[email protected]>
Date:   Thu Dec 12 16:54:21 2024 -0800

    [gnrt] Improve license file handling in readme.rs

    Refactors the license handling system in readme.rs to make it more
    maintainable and reduce the need for per-crate configuration.
    Key changes:

    - Introduces LicenseKind enum to represent different license types
    - Creates prioritized mapping of license files
      (e.g., prefer LICENSE-APACHE over generic LICENSE)
    - Replaces ALLOWED_LICENSES and EXPECTED_LICENSE_FILE with more
    structured data using HashMaps
    - Adds clear separation between license string parsing,
      README output, and file discovery
    - Improves handling of multi-license cases

    This change reduces the need to specify license_files in
    gnrt_config.toml for common cases by implementing proper
    file priority and better automatic detection of license files.

    Additionally, as intended, this addresses the issue of
    miniz_oxide having an additional license file.

    Bug: 383616482
Chromium change:
https://chromium.googlesource.com/chromium/src/+/22c4ed727602581edb27185de3effd6031767672

commit 22c4ed727602581edb27185de3effd6031767672
Author: Nathan Memmott <[email protected]>
Date:   Mon Dec 16 11:52:35 2024 -0800

    Code Health: Clean up stale NotificationTriggers

    Fixed: 356624352
Chromium change:
https://chromium.googlesource.com/chromium/src/+/d0b2f025d081622eef75e2fbf27b94bc74418c11

commit d0b2f025d081622eef75e2fbf27b94bc74418c11
Author: Ari Chivukula <[email protected]>
Date:   Mon Dec 16 10:31:43 2024 -0800

    Clean up stale base::Feature "ResourceTimingForCancelledNavigationInFrame"

    This has been enabled by default since introduced in 2023 via:
    https://chromium-review.googlesource.com/c/chromium/src/+/3976688

    Let's remove the base feature itself for cleanup.

    Fixed: 356623927
Chromium change:
https://chromium.googlesource.com/chromium/src/+/943e6a6cd3187bcaf2d487135c12e484765d1436

commit 943e6a6cd3187bcaf2d487135c12e484765d1436
Author: Muyao Xu <[email protected]>
Date:   Mon Dec 16 18:51:32 2024 -0800

    [Code Health]Remove Feature::kPrivateStateTokens and Feature::kFledgePst

    Both features has been enabled by default since M117.

    Change-Id: I446e2faaf938ba878d668bfbdc0aaafdb12d5369
    Bug: 356624913
Chromium change:
https://chromium.googlesource.com/chromium/src/+/a2b622c333dcb50f75aded93771bac39f82a56f6

commit a2b622c333dcb50f75aded93771bac39f82a56f6
Author: Nan Lin <[email protected]>
Date:   Mon Dec 16 12:15:10 2024 -0800

    [Code Health] Remove stale feature
    SafeBrowsingExtensionTelemetryDisableOffstoreExtensions

    Bug: 362247195
This enum is now `TemplateURLData::PolicyOrigin`.

Chromium change:
https://chromium.googlesource.com/chromium/src/+/1ee37e6d6648cefe6a9fdb7d4e0406db88768214

commit 1ee37e6d6648cefe6a9fdb7d4e0406db88768214
Author: Fabio Tirelo <[email protected]>
Date:   Mon Dec 16 15:16:04 2024 -0800

    [TemplateURL] Improve readability of policy origin information

    Enum `TemplateURLData::CreatedByPolicy` is very confusing, since the
    name makes it look like it refers to a boolean. This CL renames it to
    `PolicyOrigin`. It also defines some helper functions to avoid code
    repetition.

    Note: I have not changed the keywords DB column name, because we have
          plans to remove managed SEs from there soon, so we can save with
          schema migration

    Bug: 384050509
This change corrects the inclusion path for certain headers from
autofill that are currently placed under `browser/studies/`.

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

commit a7d13ab4ddc07a9667ac506708f9b988c9ae62de
Author: Florian Leimgruber <[email protected]>
Date:   Mon Dec 16 05:16:26 2024 -0800

    Create components/autofill/core/browser/studies

    See go/components-autofill-restructure. This CL was auto-generated using
    the following commands:

    DIR=components/autofill/core/browser
    mkdir $DIR/studies

    git mv $DIR/*autofill_ablation_study* $DIR/studies
    git mv $DIR/*autofill_experiments* $DIR/studies

    ./tools/git/mass-rename.py
    git cl format

    Bug: 376223525
As `BraveIsOfferValid` was taking a multable pointer, the change to a
const pointer caused a build breakage.

Chromium change:
https://chromium.googlesource.com/chromium/src/+/4ee9d87d53be7f3423cc433f769f09f9b33c62af

commit 4ee9d87d53be7f3423cc433f769f09f9b33c62af
Author: Jan Keitel <[email protected]>
Date:   Tue Dec 17 01:19:36 2024 -0800

    Let PayDM::GetAutofillOffers return vector of const pointers.

    As a drive-by, only pass PayDM to the AutofillOfferManager. It does
    not need the full PersonalDataManager.

    Bug: 40100455
Previously this was a common integral, which requires wrapping the user
ID into this type now.

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

commit bee274de563133afa840118c0117889641159a32
Author: Mikel Astiz <[email protected]>
Date:   Mon Dec 16 11:54:31 2024 -0800

    Adopt class GaiaId broadly under //chrome except in unit-tests

    This patch disallows implicit conversion to and from std::string for
    class GaiaId, improving type safety and fixing a temporary violation of
    the style guide.

    Unit-tests and iOS are excluded for now via #ifdef's in gaia_id.h to
    continue allowing implicit conversion, to reduce the size of this patch
    and minimize the risk for regressions (as tests continue to pass without
    changes).

    Bug: 380416867
Chromium change:
https://chromium.googlesource.com/chromium/src/+/05063a4b95c9de0d4ae39d93af8f55fed9ba0ba9

commit 05063a4b95c9de0d4ae39d93af8f55fed9ba0ba9
Author: Nan Lin <[email protected]>
Date:   Tue Dec 17 12:45:11 2024 -0800

    [Code Health] Remove stale feature MetricsServiceDeltaSnapshotInBg

    Bug: 362246957
Otherwise there is an error:
Service org.chromium.chrome.browser.media.ui.BraveMediaNotificationControllerServices$PlaybackListenerMicService should be declared in the base manifest, but is in "chrome" module. For details, see b/169196314.

Chromium change:
https://chromium.googlesource.com/chromium/src/+/18745fae2496b52add5a4b678f8954c4a5b75718

Fix bug where we did not validate bundle for isolated splits

Added an allowlist to get this check back on, and then we can decide
on priority of burndown.

Bug: 381244132
We intend to use LoginDatabase as the backend for password manager going forward, so here we just explicitly call Chromium's code in else block to avoid error:

../../chrome/browser/password_manager/android/login_db_deprecation_runner_factory.cc:43:22: error: code will never be executed [-Werror,-Wunreachable-code]
   43 |   Profile* profile = Profile::FromBrowserContext(context);

Chromium change:
https://chromium.googlesource.com/chromium/src/+/193e77705d4c5176af6571407fdfe753bf215f68

[UPMLoginDbSunset] Add factory for DB deprecation export service

It owns a service which creates the exporter and destroys it once
the export is done. It only creates the service for clients who have unmigrated passwords.

Bug: 378650395
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/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
Development

Successfully merging this pull request may close these issues.

7 participants