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 97 to Chromium 98 (uplift to 1.35.x). #11985

Merged
merged 9 commits into from
Jan 27, 2022

Conversation

mkarolin
Copy link
Collaborator

@mkarolin mkarolin commented Jan 25, 2022

Fixes brave/brave-browser#19664
Fixes brave/brave-browser#20648
Uplift from #11223

Also uplifts the following:

SKUs uplifts

Fixes brave/brave-browser#17614
Fixes brave/brave-browser#17254
Uplift from #10847

Fixes brave/brave-browser#20542
Uplift from #11878

Fixes brave/brave-browser#20547
Uplift from #11887

Fixes brave/brave-browser#20693
Uplift from #11992

Fixes brave/brave-browser#19959
Uplift from #11461

Cr98 follow-ups

Fixes brave/brave-browser#20696
Uplift from #12004

Fixes brave/brave-browser#20686
Uplift from #11987

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:

  • SKU functionality can be tested on Desktop and Android
  • For Android, you can remotely connect using Desktop dev tools so that you can inspect/interact with console

Verify SKU functionality is disable on allow-list domains

  1. Visit https://account.brave.software and enter basic auth credentials (reach out to @bsclifton for details)
  2. Open dev tools (F12, etc) and go to Console tab
  3. Paste in: await window.chrome.braveSkus.refresh_order('0ee1e3ee-afc3-4f2f-b2a2-3d1e401e1530') and hit enter. It should show
    Uncaught TypeError: Cannot read properties of undefined (reading 'refresh_order')
    at <anonymous>:1:31
    
  4. Steps 1-3 can be repeated on https://account.brave.com or https://account.bravesoftware.com

Verify SKU functionality is disabled on non-allowed domains

  1. Visit any non-Brave website
  2. Open dev tools (F12, etc) and go to Console tab
  3. Paste in: await window.chrome.braveSkus.refresh_order('0ee1e3ee-afc3-4f2f-b2a2-3d1e401e1530') and hit enter. It should show
    Uncaught TypeError: Cannot read properties of undefined (reading 'refresh_order')
    at <anonymous>:1:31
    

@mkarolin mkarolin self-assigned this Jan 25, 2022
@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 Jan 25, 2022
@mkarolin mkarolin force-pushed the cr98-1.35.x branch 3 times, most recently from fc6f654 to 3ae1f59 Compare January 26, 2022 19:39
@mkarolin mkarolin requested a review from a team January 26, 2022 20:46
@mkarolin mkarolin changed the title WIP: Upgrade from Chromium 97 to Chromium 98 (uplift from 1.35.x). Upgrade from Chromium 97 to Chromium 98 (uplift from 1.35.x). Jan 26, 2022
@mkarolin mkarolin marked this pull request as ready for review January 26, 2022 20:46
@mkarolin mkarolin requested review from emerick and szilardszaloki and removed request for a team January 26, 2022 20:46
@mkarolin mkarolin changed the title Upgrade from Chromium 97 to Chromium 98 (uplift from 1.35.x). Upgrade from Chromium 97 to Chromium 98 (uplift to 1.35.x). Jan 26, 2022
bsclifton and others added 8 commits January 26, 2022 16:19
Integrate with SKU SDK (Rust) and provide safe credential interception for VPN
unexport guard should match verify_chrome_framework_order, not enable…
Upgrade from Chromium 97 to Chromium 98
Add NOLINT for known issue added w/ SKUs
[iOS] Removes use_xcode_clang flag from build config.
@mkarolin
Copy link
Collaborator Author

Rebased on 1.35.x.

@kjozwiak kjozwiak added CI/skip-android Do not run CI builds for Android CI/skip-linux labels Jan 26, 2022
@kjozwiak
Copy link
Member

Added CI/skip-android, CI/skip-linux & CI/skip-windows as they've already passed so they don't get restarted when @mkarolin pushes a fix for iOS due to the following:

 ../../brave/ios/browser/skus/skus_sdk_factory_wrappers.mm:24:9: error: use of undeclared identifier 'SkusSkusServiceMojoImpl'
18:17:17        [[SkusSkusServiceMojoImpl alloc] initWithSkusService:std::move(service)];
18:17:17          ^
18:17:17  1 error generated.

@mkarolin mkarolin added the CI/skip-macos-x64 Do not run CI builds for macOS x64 label Jan 27, 2022
@mkarolin
Copy link
Collaborator Author

Adding CI/skip-macos since it passed.

@mkarolin mkarolin force-pushed the cr98-1.35.x branch 3 times, most recently from f3b6201 to 1acdac6 Compare January 27, 2022 01:59
Support passing in a PendingRemote to mojo generated Obj-C wrappers
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.35.x approved after deliberating with @brave/uplift-approvers.

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/skip-android Do not run CI builds for Android CI/skip-macos-x64 Do not run CI builds for macOS x64
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants