Check and set kOtherBookmarksMigrated in BraveProfileSyncServiceImpl

brave · Feb 8, 2020 · 0a1f04a · 0a1f04a
1 parent dbc8ae5
commit 0a1f04a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/components/brave_sync/BUILD.gn b/components/brave_sync/BUILD.gn
@@ -37,6 +37,7 @@ if (enable_brave_sync) {
       ":public",
       ":static_resources",
       "//base",
+      "//brave/common:common",
       "//chrome/common",
       "//components/bookmarks/browser",
       "//components/bookmarks/common",

diff --git a/components/brave_sync/brave_profile_sync_service_impl.cc b/components/brave_sync/brave_profile_sync_service_impl.cc
@@ -13,6 +13,7 @@
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
+#include "brave/common/pref_names.h"
 #include "brave/components/brave_sync/brave_sync_prefs.h"
 #include "brave/components/brave_sync/brave_sync_service_observer.h"
 #include "brave/components/brave_sync/client/brave_sync_client_impl.h"
@@ -28,6 +29,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/chrome_sync_client.h"
 #include "components/bookmarks/browser/bookmark_model.h"
+#include "components/prefs/pref_service.h"
 #include "components/signin/public/identity_manager/account_info.h"
 #include "components/sync/engine_impl/syncer.h"
 #include "content/public/browser/browser_thread.h"
@@ -488,7 +490,10 @@ void BraveProfileSyncServiceImpl::OnSyncReady() {
     ProfileSyncService::GetUserSettings()->SetSyncRequested(true);
   }
 
-  BraveMigrateOtherNodeFolder(model_);
+  if (!sync_client_->GetPrefService()->GetBoolean(kOtherBookmarksMigrated)) {
+    BraveMigrateOtherNodeFolder(model_);
+    sync_client_->GetPrefService()->SetBoolean(kOtherBookmarksMigrated, true);
+  }
 }
 
 syncer::ModelTypeSet BraveProfileSyncServiceImpl::GetPreferredDataTypes()