[Sync] Remove UpdateGUIDWithNodeReplacement feature toggle

The feature toggle was enabled by default in M83.

Change-Id: I9afb7659990af267540dcd044bafda3dc1c3d8bc
Bug: None
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2426426
Reviewed-by: Mikel Astiz <[email protected]>
Commit-Queue: Rushan Suleymanov <[email protected]>
Cr-Commit-Position: refs/heads/master@{#810104}

Author: Rushan Suleymanov

components/sync_bookmarks/bookmark_specifics_conversions.cc

@@ -303,9 +303,7 @@ void UpdateBookmarkNodeFromSpecifics(
   // resolving any conflict in GUID. Either GUIDs are the same, or the GUID in
   // specifics is invalid, and hence we can ignore it.
   DCHECK(specifics.guid() == node->guid() ||
-         !base::IsValidGUIDOutputString(specifics.guid()) ||
-         !base::FeatureList::IsEnabled(
-             switches::kUpdateBookmarkGUIDWithNodeReplacement));
+         !base::IsValidGUIDOutputString(specifics.guid()));
 
   if (!node->is_folder()) {
     model->SetURL(node, GURL(specifics.url()));
@@ -322,18 +320,14 @@ const bookmarks::BookmarkNode* ReplaceBookmarkNodeGUID(
     const bookmarks::BookmarkNode* node,
     const std::string& guid,
     bookmarks::BookmarkModel* model) {
-  if (!base::FeatureList::IsEnabled(
-          switches::kUpdateBookmarkGUIDWithNodeReplacement)) {
-    return node;
-  }
-  const bookmarks::BookmarkNode* new_node;
   DCHECK(base::IsValidGUIDOutputString(guid));
 
   if (node->guid() == guid) {
     // Nothing to do.
     return node;
   }
 
+  const bookmarks::BookmarkNode* new_node = nullptr;
   if (node->is_folder()) {
     new_node =
         model->AddFolder(node->parent(), node->parent()->GetIndexOf(node),

components/sync_bookmarks/switches.cc

@@ -9,10 +9,6 @@ namespace switches {
 const base::Feature kSyncDoNotCommitBookmarksWithoutFavicon = {
     "SyncDoNotCommitBookmarksWithoutFavicon", base::FEATURE_ENABLED_BY_DEFAULT};
 
-// Enables updating a BookmarkNode's GUID by replacing the node itself.
-const base::Feature kUpdateBookmarkGUIDWithNodeReplacement{
-    "UpdateGUIDWithNodeReplacement", base::FEATURE_ENABLED_BY_DEFAULT};
-
 // Enables the GUID-aware merge algorithm.
 const base::Feature kMergeBookmarksUsingGUIDs{"MergeBookmarksUsingGUIDs",
                                               base::FEATURE_ENABLED_BY_DEFAULT};

components/sync_bookmarks/switches.h

@@ -10,7 +10,6 @@
 namespace switches {
 
 extern const base::Feature kSyncDoNotCommitBookmarksWithoutFavicon;
-extern const base::Feature kUpdateBookmarkGUIDWithNodeReplacement;
 extern const base::Feature kMergeBookmarksUsingGUIDs;
 // TODO(crbug.com/1066962): remove this code when most of bookmarks are
 // reuploaded.