Save this device object id for future update

components/brave_sync/brave_profile_sync_service_impl.cc

@@ -875,6 +875,7 @@ void BraveProfileSyncServiceImpl::SendCreateDevice() {
 
   std::string device_name = brave_sync_prefs_->GetThisDeviceName();
   std::string object_id = tools::GenerateObjectId();
+  brave_sync_prefs_->SetThisDeviceObjectId(object_id);
   std::string device_id = brave_sync_prefs_->GetThisDeviceId();
   std::string device_id_v2 = brave_sync_prefs_->GetThisDeviceIdV2();
   CHECK(!device_id.empty());

components/brave_sync/brave_sync_prefs.cc

@@ -22,6 +22,7 @@ namespace prefs {
 
 const char kSyncDeviceId[] = "brave_sync.device_id";
 const char kSyncDeviceIdV2[] = "brave_sync.device_id_v2";
+const char kSyncDeviceObjectId[] = "brave_sync.device_object_id";
 const char kSyncSeed[] = "brave_sync.seed";
 const char kSyncPrevSeed[] = "brave_sync.previous_seed";
 const char kSyncDeviceName[] = "brave_sync.device_name";
@@ -48,6 +49,7 @@ Prefs::Prefs(PrefService* pref_service) : pref_service_(pref_service) {}
 void Prefs::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterStringPref(prefs::kSyncDeviceId, std::string());
   registry->RegisterStringPref(prefs::kSyncDeviceIdV2, std::string());
+  registry->RegisterStringPref(prefs::kSyncDeviceObjectId, std::string());
   registry->RegisterStringPref(prefs::kSyncSeed, std::string());
   registry->RegisterStringPref(prefs::kSyncPrevSeed, std::string());
   registry->RegisterStringPref(prefs::kSyncDeviceName, std::string());
@@ -99,6 +101,15 @@ void Prefs::SetThisDeviceIdV2(const std::string& device_id_v2) {
   pref_service_->SetString(kSyncDeviceIdV2, device_id_v2);
 }
 
+std::string Prefs::GetThisDeviceObjectId() const {
+  return pref_service_->GetString(kSyncDeviceObjectId);
+}
+
+void Prefs::SetThisDeviceObjectId(const std::string& device_object_id) {
+  DCHECK(!device_object_id.empty());
+  pref_service_->SetString(kSyncDeviceObjectId, device_object_id);
+}
+
 std::string Prefs::GetThisDeviceName() const {
   return pref_service_->GetString(kSyncDeviceName);
 }
@@ -266,6 +277,8 @@ void Prefs::SetRecordToResendMeta(const std::string& object_id,
 
 void Prefs::Clear() {
   pref_service_->ClearPref(kSyncDeviceId);
+  pref_service_->ClearPref(kSyncDeviceIdV2);
+  pref_service_->ClearPref(kSyncDeviceObjectId);
   pref_service_->ClearPref(kSyncSeed);
   pref_service_->ClearPref(kSyncDeviceName);
   pref_service_->ClearPref(kSyncEnabled);

components/brave_sync/brave_sync_prefs.h

@@ -85,6 +85,8 @@ class Prefs {
   void SetThisDeviceId(const std::string& device_id);
   std::string GetThisDeviceIdV2() const;
   void SetThisDeviceIdV2(const std::string& device_id_v2);
+  std::string GetThisDeviceObjectId() const;
+  void SetThisDeviceObjectId(const std::string& device_object_id);
   std::string GetThisDeviceName() const;
   void SetThisDeviceName(const std::string& device_name);
   std::string GetBookmarksBaseOrder();