Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(719)

Unified Diff: components/browser_sync/profile_sync_service.cc

Issue 2961673002: [sync] Fix IsSyncConfirmationNeeded crash when local backend is enabled (Closed)
Patch Set: Fix cros test Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | components/browser_sync/profile_sync_service_startup_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/browser_sync/profile_sync_service.cc
diff --git a/components/browser_sync/profile_sync_service.cc b/components/browser_sync/profile_sync_service.cc
index 44c5cdd97e964fc588db245a1cd8e37f569709d2..0bf8b696ee84cd1cba28b03c9445e1e5727954d8 100644
--- a/components/browser_sync/profile_sync_service.cc
+++ b/components/browser_sync/profile_sync_service.cc
@@ -788,8 +788,8 @@ void ProfileSyncService::SetFirstSetupComplete() {
bool ProfileSyncService::IsSyncConfirmationNeeded() const {
DCHECK(thread_checker_.CalledOnValidThread());
- return IsSignedIn() && !IsFirstSetupInProgress() && !IsFirstSetupComplete() &&
- IsSyncRequested();
+ return (!IsLocalSyncEnabled() && IsSignedIn()) && !IsFirstSetupInProgress() &&
+ !IsFirstSetupComplete() && IsSyncRequested();
}
void ProfileSyncService::UpdateLastSyncedTime() {
« no previous file with comments | « no previous file | components/browser_sync/profile_sync_service_startup_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698