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

Include shield content settings into cookie rules #3690

Merged
merged 4 commits into from
Oct 15, 2019
Merged

Conversation

iefremov
Copy link
Contributor

@iefremov iefremov commented Oct 14, 2019

Fix brave/brave-browser#6464

Submitter Checklist:

Test Plan:

Reviewer Checklist:

  • New files have MPL-2.0 license header.
  • Request a security/privacy review as needed.
  • Adequate test coverage exists to prevent regressions
  • Verify test plan is specified in PR before merging to source

After-merge Checklist:

  • The associated issue milestone is set to the smallest version that the
    changes has landed on.
  • All relevant documentation has been updated.

@iefremov iefremov requested a review from bridiver October 14, 2019 09:54
@iefremov iefremov changed the title .Include shield content settings into cookie rules Include shield content settings into cookie rules Oct 14, 2019
@iefremov
Copy link
Contributor Author

Easier to review per-commit, since I've refactored and clang-formatted some tests

Copy link
Member

@bsclifton bsclifton left a comment

Choose a reason for hiding this comment

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

Changes worked great for me - I updated the issue to have an easy to test URL for knowing if cookie is blocked or not

I did notice one failing browser test though:

1 test failed:
    BraveContentSettingsObserverBrowserTest.ShieldsDownOverridesBlockedCookies (../../brave/renderer/brave_content_settings_observer_browsertest.cc:639)

@iefremov
Copy link
Contributor Author

@bsclifton I believe it was fixed after the force push. I think we are safe to merge after the CI pass

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Disabled shields for a website are ignored by cookie service
3 participants