Revert 110384 - Revert 110356 - Sync: Improve handling of database load failures

chrome/browser/sync/profile_sync_service.cc

Index: chrome/browser/sync/profile_sync_service.cc
===================================================================
--- chrome/browser/sync/profile_sync_service.cc	(revision 110386)
+++ chrome/browser/sync/profile_sync_service.cc	(working copy)
@@ -555,11 +555,16 @@
 
 void ProfileSyncService::OnBackendInitialized(
     const WeakHandle<JsBackend>& js_backend, bool success) {
+  if (HasSyncSetupCompleted()) {
+    UMA_HISTOGRAM_BOOLEAN("Sync.FirstBackendInitializeSuccess", success);
+  } else {
+    UMA_HISTOGRAM_BOOLEAN("Sync.RestoreBackendInitializeSuccess", 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();
     return;
   }