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

Unified Diff: chrome/browser/sync/profile_sync_service.cc

Issue 8496002: Sync: Improve handling of database load failures (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Many improvements and scope expansion Created 9 years, 1 month 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
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 e6a2cef071c94b85cac1d02346af4d41e81adbc1..b03e5b34006aa24dab6c571fdf5f1693bb780bc5 100644
--- a/chrome/browser/sync/profile_sync_service.cc
+++ b/chrome/browser/sync/profile_sync_service.cc
@@ -556,10 +556,9 @@ void ProfileSyncService::OnUnrecoverableError(
void ProfileSyncService::OnBackendInitialized(
const WeakHandle<JsBackend>& js_backend, bool success) {
if (!success) {
- // If backend initialization failed, abort. We only want to blow away
- // state (DBs, etc) if this was a first-time scenario that failed.
- wizard_.Step(SyncSetupWizard::FATAL_ERROR);
- Shutdown(!HasSyncSetupCompleted());
+ // Something went unexpectedly wrong. Play it safe: nuke our current state
+ // and prepare ourselves to try again later.
+ DisableForUser();
tim (not reviewing) 2011/11/14 19:13:13 Lets add a UMA counter here so we track the # of u
rlarocque 2011/11/14 22:56:26 Done.
return;
}

Powered by Google App Engine
This is Rietveld 408576698