Prevent duplication of brave-sync metainfo in bookmarks on copying; fixes brave-browser#8325

Author: AlexeyBarabash

browser/profiles/brave_bookmark_model_loaded_observer.cc

@@ -41,5 +41,10 @@ void BraveBookmarkModelLoadedObserver::BookmarkModelLoaded(
 #endif
     profile_->GetPrefs()->SetBoolean(kOtherBookmarksMigrated, true);
   }
+
+#if BUILDFLAG(ENABLE_BRAVE_SYNC)
+  BraveProfileSyncServiceImpl::AddNonClonedBookmarkKeys(model);
+#endif
+
   BookmarkModelLoadedObserver::BookmarkModelLoaded(model, ids_reassigned);
 }

components/brave_sync/brave_profile_sync_service_impl.cc

@@ -523,6 +523,17 @@ void BraveProfileSyncServiceImpl::OnSyncReadyBookmarksModelLoaded() {
   }
 }
 
+// static
+void BraveProfileSyncServiceImpl::AddNonClonedBookmarkKeys(
+    BookmarkModel* model) {
+  DCHECK(model);
+  DCHECK(model->loaded());
+  model->AddNonClonedKey("object_id");
+  model->AddNonClonedKey("order");
+  model->AddNonClonedKey("sync_timestamp");
+  model->AddNonClonedKey("version");
+}
+
 syncer::ModelTypeSet BraveProfileSyncServiceImpl::GetPreferredDataTypes()
     const {
   // Force DEVICE_INFO type to have nudge cycle each time to fetch

components/brave_sync/brave_profile_sync_service_impl.h

@@ -175,6 +175,8 @@ class BraveProfileSyncServiceImpl
   BraveSyncClient* GetBraveSyncClient() override;
 #endif
 
+  static void AddNonClonedBookmarkKeys(BookmarkModel* model);
+
   bool IsBraveSyncEnabled() const override;
 
   syncer::ModelTypeSet GetPreferredDataTypes() const override;