Fix ability to delete other device from the sync chain #11313
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mkarolin
reviewed
Nov 29, 2021
| const std::string guid = change->storage_key(); | ||
|
|
||
| // Reupload local device if it was deleted from the server. | ||
| + if (bool false_as_brave_needs_skip_next_if = false) |
There was a problem hiding this comment.
Seems like we can follow our patching patterns here and use #define BRAVE_DEVICE_INFO_SYNC_BRIDGE_APPLY_SYNC_CHANGES_SKIP_NEXT_IF if (false) in the chromium_src override.
There was a problem hiding this comment.
and you can also add comment in the overridden file
There was a problem hiding this comment.
AlexeyBarabash
force-pushed
the
sync_fix_delete_other_device
branch
from
3bb43a4 to
2ac8203
Compare
mkarolin
reviewed
Nov 29, 2021
| @@ -13,8 +13,14 @@ | |||
| #define RefreshLocalDeviceInfoIfNeeded \ | |||
| RefreshLocalDeviceInfoIfNeeded_ChromiumImpl | |||
|
|
|||
| // This macro disables Chromium's block which detects whether the local | |||
| // device record should be re-uppload to server. We disable it because it | |||
There was a problem hiding this comment.
mkarolin
approved these changes
Nov 29, 2021
fixes brave/brave-browser#19561 This commit reverts commit https://chromium-review.googlesource.com/c/chromium/src/+/3001364 from the upstream because it breaks ability to delete other device from the sync chain
AlexeyBarabash
force-pushed
the
sync_fix_delete_other_device
branch
from
2ac8203 to
a2bc0c2
Compare
darkdh
approved these changes
Nov 30, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Basically this PR reverts https://chromium-review.googlesource.com/c/chromium/src/+/3001364 and updates the tests to be aware in future if Chromium will change the behavior near this place.
I had to use patch for
src/components/sync_device_info/device_info_sync_bridge.cc.Resolves brave/brave-browser#19561
Submitter Checklist:
QA/YesorQA/No;release-notes/includeorrelease-notes/exclude;OS/...) to the associated issuenpm run test -- brave_browser_tests,npm run test -- brave_unit_tests,npm run lint,npm run gn_check,npm run tslintgit rebase master(if needed)Reviewer Checklist:
gnAfter-merge Checklist:
changes has landed on
Test Plan:
Use one from brave/brave-browser#19561