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 clear cookies on exit toggle. #3785

Merged
merged 1 commit into from Oct 30, 2019
Merged

Conversation

mkarolin
Copy link
Collaborator

@mkarolin mkarolin commented Oct 23, 2019

Fixes brave/brave-browser#6119

Account for CONTENT_SETTING_SESSION_ONLY as a possibility for the
default cookie setting in preferences - do not override it with
CONTENT_SETTING_ALLOW if it's already set.

Added browser test CookiePrefServiceTest.CookieControlType_Preference to
test Shields cookie setting change when preference setting changes
and in reverse.

Submitter Checklist:

Test Plan:

See STR in brave/brave-browser#6119

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.

@mkarolin mkarolin added this to the 0.73.x - Nightly milestone Oct 23, 2019
@mkarolin mkarolin self-assigned this Oct 23, 2019
@mkarolin mkarolin force-pushed the maxk-fix-clear-cookies branch 2 times, most recently from 92589a6 to 130fed5 Compare October 23, 2019 23:26
Fixes brave/brave-browser#6119

Account for CONTENT_SETTING_SESSION_ONLY as a possibility for the
default cookie setting in preferences - do not override it with
CONTENT_SETTING_ALLOW if it's already set.

Added browser test CookiePrefServiceTest.CookieControlType_Preference to
test Shields cookie setting change when preference setting changes
and in reverse.
@mkarolin
Copy link
Collaborator Author

CI only failed on lint.

@mkarolin mkarolin changed the title WIP: Fixes clear cookies on exit toggle. Fixes clear cookies on exit toggle. Oct 24, 2019
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.

Works great! 😄 Thanks for adding a test too

@bsclifton bsclifton merged commit b22e07e into master Oct 30, 2019
@bsclifton bsclifton deleted the maxk-fix-clear-cookies branch October 30, 2019 06:11
brave-builds pushed a commit that referenced this pull request Oct 30, 2019
brave-builds pushed a commit that referenced this pull request Oct 30, 2019
bsclifton pushed a commit that referenced this pull request Oct 30, 2019
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