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

fixes ads on yt and gets rid of csp error (uplift to 1.22.x) #8077

Merged
merged 1 commit into from
Feb 26, 2021

Conversation

brave-builds
Copy link
Collaborator

@brave-builds brave-builds commented Feb 25, 2021

Uplift of #8071
Resolves brave/brave-browser#14359

Pre-approval checklist:

  • You have tested your change on Nightly.
  • This contains text which needs to be translated.
    • There are more than 7 days before the release.
    • I've notified folks in #l10n on Slack that translations are needed.
  • The PR milestones match the branch they are landing to.

Pre-merge checklist:

  • You have checked CI and the builds, lint, and tests all pass or are not related to your PR.

Post-merge checklist:

  • The associated issue milestone is set to the smallest version that the changes is landed on.

@brave-builds brave-builds requested a review from a team as a code owner February 25, 2021 15:50
@brave-builds brave-builds requested a review from a team February 25, 2021 15:51
@brave-builds brave-builds self-assigned this Feb 25, 2021
@brave-builds brave-builds added this to the 1.22.x - Beta milestone Feb 25, 2021
@kjozwiak
Copy link
Member

kjozwiak commented Feb 26, 2021

@SergeyZhukovsky looks like post-init failed on lint a per https://ci.brave.com/job/pr-brave-browser-pr8071_yt_ads_problem_1.22.x-post-init/1/execution/node/147/log/. Mind taking a look?

11:25:15  Running cpplint...
11:25:15  chromium_src/chrome/common/chrome_isolated_world_ids.h:6:  #ifndef header guard has wrong style, please use: BRAVE_CHROMIUM_SRC_CHROME_COMMON_CHROME_ISOLATED_WORLD_IDS_H_  [build/header_guard] [5]
11:25:15  chromium_src/chrome/common/chrome_isolated_world_ids.h:16:  #endif line should be "#endif  // BRAVE_CHROMIUM_SRC_CHROME_COMMON_CHROME_ISOLATED_WORLD_IDS_H_"  [build/header_guard] [5]

Restarting macOS as it looks like both test-browser & test-unit never completed.

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.22.x approved after deliberating with @brave/uplift-approvers. QA has verified the PR on Nightly as per #8071 (comment). The lint issues mentioned via #8077 (comment) will be addressed in https://github.com/brave/brave-core/pull/8081/files#diff-43908f4c88195ffd975034fbc1aafb83cd7929f33802f13a05ebfb2a454a99f2L6 which will also be uplifted into 1.22.x & 1.21.x.

@kjozwiak kjozwiak merged commit 203263f into 1.22.x Feb 26, 2021
@kjozwiak kjozwiak deleted the pr8071_yt_ads_problem_1.22.x branch February 26, 2021 03:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants