[Sync] Handle errors during first sync gracefully.

chrome/browser/sync/sync_setup_flow.cc

Index: chrome/browser/sync/sync_setup_flow.cc
diff --git a/chrome/browser/sync/sync_setup_flow.cc b/chrome/browser/sync/sync_setup_flow.cc
index 9806c7684f870971ad9b8135fb28e6ab3028cb9c..a19bdae507a0f6ba071113a174b6edb979204631 100644
--- a/chrome/browser/sync/sync_setup_flow.cc
+++ b/chrome/browser/sync/sync_setup_flow.cc
@@ -551,6 +551,11 @@ bool SyncSetupFlow::ShouldAdvance(SyncSetupWizard::State state) {
       return current_state_ != SyncSetupWizard::ABORT;
     case SyncSetupWizard::ABORT:
       return true;
+    case SyncSetupWizard::CONFIGURE_RETRY:
+      return current_state_ == SyncSetupWizard::SYNC_EVERYTHING ||
+             current_state_ == SyncSetupWizard::CONFIGURE ||
+             current_state_ == SyncSetupWizard::SETTING_UP ||
+             current_state_ == SyncSetupWizard::GAIA_SUCCESS;
     case SyncSetupWizard::DONE:
       return current_state_ == SyncSetupWizard::SETTING_UP ||
              current_state_ == SyncSetupWizard::ENTER_PASSPHRASE;
@@ -641,6 +646,17 @@ void SyncSetupFlow::ActivateState(SyncSetupWizard::State state) {
           service_->profile()->GetPrefs()->GetString(
           prefs::kGoogleServicesUsername)));
       break;
+    case SyncSetupWizard::CONFIGURE_RETRY:
+      // It is upto each platform to implement the screen. In default case
+      // we just fall back to a UNRECOVERABLE_ERROR which would fallback
+      // to FATAL_ERROR. TODO(sync): We need to have a seperate screen
+      // for handling this.

[Andrew T Wilson (Slow), 2012/01/27 00:19:03]

This is a little weird, because now we're in CONFIGURE_RETRY state, and I'm not
sure what other platforms like chromeos ought to do here - force-step to a
different state? I don't think the logic in ShouldAdvance will let us transition
out of CONFIGURE_RETRY to anything but FATAL_ERROR.

Maybe the cleaner way to do this is to not have a CONFIGURE_RETRY state at all,
but to instead check the auto_start_enabled_ state as I suggested previously.

[lipalani1, 2012/01/27 02:54:29]

This code is removed.
On 2012/01/27 00:19:03, Andrew T Wilson wrote:

+      MessageLoop::current()->PostTask(FROM_HERE,
+          base::Bind(&ProfileSyncService::OnUnrecoverableError,
+                     service_->AsWeakPtr(),
+                     FROM_HERE,
+                     "Configure is in retry mode"));
+      break;
     default:
       NOTREACHED() << "Invalid advance state: " << state;
   }