Index: chrome/browser/sync/profile_sync_service.cc |
diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc |
index aa95e2aed73e0059e01afed2d9cbe79c48b0195e..4ebe246b5a21196f8e65ad759a99645feb327677 100644 |
--- a/chrome/browser/sync/profile_sync_service.cc |
+++ b/chrome/browser/sync/profile_sync_service.cc |
@@ -598,6 +598,11 @@ void ProfileSyncService::OnClearServerDataSucceeded() { |
void ProfileSyncService::OnPassphraseRequired(bool for_decryption) { |
DCHECK(backend_.get()); |
DCHECK(backend_->IsNigoriEnabled()); |
+ if (unrecoverable_error_detected_) { |
+ // When unrecoverable error is detected we post a task to shutdown the |
tim (not reviewing)
2011/04/18 16:11:47
I don't quite understand a) how or if this arose a
lipalani1
2011/04/18 20:36:41
This arose because of this patch and how the threa
|
+ // backend. The task might not have executed yet. |
+ return; |
+ } |
observed_passphrase_required_ = true; |
passphrase_required_for_decryption_ = for_decryption; |