Commit 98dbd017 authored by Rushan Suleymanov's avatar Rushan Suleymanov Committed by Commit Bot

[Sync] Remove SyncProcessBookmarkRestoreAfterDeletion feature toggle

The feature toggle was enabled by default in M83 and now it is a good
time to clean it up with related code.

Bug: 1114738
Change-Id: I87a7cb9464a0802a219527e3958e6b33a9708f0d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2346307Reviewed-by: default avatarMarc Treib <treib@chromium.org>
Commit-Queue: Rushan Suleymanov <rushans@google.com>
Cr-Commit-Position: refs/heads/master@{#796758}
parent ec791fb5
...@@ -109,8 +109,7 @@ void BookmarkModelObserverImpl::BookmarkNodeAdded( ...@@ -109,8 +109,7 @@ void BookmarkModelObserverImpl::BookmarkNodeAdded(
const SyncedBookmarkTracker::Entity* entity = const SyncedBookmarkTracker::Entity* entity =
bookmark_tracker_->GetTombstoneEntityForGuid(node->guid()); bookmark_tracker_->GetTombstoneEntityForGuid(node->guid());
const base::Time creation_time = base::Time::Now(); const base::Time creation_time = base::Time::Now();
if (entity && base::FeatureList::IsEnabled( if (entity) {
switches::kSyncProcessBookmarkRestoreAfterDeletion)) {
bookmark_tracker_->UndeleteTombstoneForBookmarkNode(entity, node); bookmark_tracker_->UndeleteTombstoneForBookmarkNode(entity, node);
bookmark_tracker_->Update(entity, entity->metadata()->server_version(), bookmark_tracker_->Update(entity, entity->metadata()->server_version(),
creation_time, unique_position, specifics); creation_time, unique_position, specifics);
......
...@@ -20,10 +20,6 @@ const base::Feature kMergeBookmarksUsingGUIDs{"MergeBookmarksUsingGUIDs", ...@@ -20,10 +20,6 @@ const base::Feature kMergeBookmarksUsingGUIDs{"MergeBookmarksUsingGUIDs",
const base::Feature kSyncReuploadBookmarkFullTitles{ const base::Feature kSyncReuploadBookmarkFullTitles{
"SyncReuploadBookmarkFullTitles", base::FEATURE_DISABLED_BY_DEFAULT}; "SyncReuploadBookmarkFullTitles", base::FEATURE_DISABLED_BY_DEFAULT};
const base::Feature kSyncProcessBookmarkRestoreAfterDeletion{
"SyncProcessBookmarkRestoreAfterDeletion",
base::FEATURE_ENABLED_BY_DEFAULT};
const base::Feature kSyncDeduplicateAllBookmarksWithSameGUID{ const base::Feature kSyncDeduplicateAllBookmarksWithSameGUID{
"SyncDeduplicateAllBookmarksWithSameGUID", "SyncDeduplicateAllBookmarksWithSameGUID",
base::FEATURE_ENABLED_BY_DEFAULT}; base::FEATURE_ENABLED_BY_DEFAULT};
......
...@@ -15,8 +15,6 @@ extern const base::Feature kMergeBookmarksUsingGUIDs; ...@@ -15,8 +15,6 @@ extern const base::Feature kMergeBookmarksUsingGUIDs;
// TODO(crbug.com/1066962): remove this code when most of bookmarks are // TODO(crbug.com/1066962): remove this code when most of bookmarks are
// reuploaded. // reuploaded.
extern const base::Feature kSyncReuploadBookmarkFullTitles; extern const base::Feature kSyncReuploadBookmarkFullTitles;
// TODO(crbug.com/1071061): remove after launching.
extern const base::Feature kSyncProcessBookmarkRestoreAfterDeletion;
// This switch is used to disable removing of bookmark duplicates by GUID. // This switch is used to disable removing of bookmark duplicates by GUID.
extern const base::Feature kSyncDeduplicateAllBookmarksWithSameGUID; extern const base::Feature kSyncDeduplicateAllBookmarksWithSameGUID;
// TODO(crbug.com/1075709): remove after launch. // TODO(crbug.com/1075709): remove after launch.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment