From e5d4e6939e52740be8c5f1a7e9c79f3cf12eea8f Mon Sep 17 00:00:00 2001
From: AlexeyBarabash <alexey@brave.com>
Date: Wed, 26 May 2021 16:10:44 +0300
Subject: [PATCH] Uplift of #8929 (squashed) to release

---
 components/brave_sync/profile_sync_service_helper.cc | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/components/brave_sync/profile_sync_service_helper.cc b/components/brave_sync/profile_sync_service_helper.cc
index 3f8def0ea780..bfcff26a3668 100644
--- a/components/brave_sync/profile_sync_service_helper.cc
+++ b/components/brave_sync/profile_sync_service_helper.cc
@@ -30,6 +30,13 @@ void ResetSync(syncer::BraveProfileSyncService* sync_service,
   const syncer::DeviceInfo* local_device_info =
       device_info_service->GetLocalDeviceInfoProvider()->GetLocalDeviceInfo();
 
+  // Remove DCHECK when will be found the reason of the issue
+  // https://github.com/brave/brave-browser/issues/16066 .
+  DCHECK(local_device_info);
+  if (!local_device_info) {
+    return;
+  }
+
   sync_service->SuspendDeviceObserverForOwnReset();
 
   tracker->DeleteDeviceInfo(