[Sync] Handle errors during first sync gracefully.

chrome/browser/sync/sync_setup_flow.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/sync/sync_setup_flow.h"
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
@@ skipping 533 matching lines @@
       return current_state_ != SyncSetupWizard::ABORT;
     case SyncSetupWizard::SETTING_UP:
       return current_state_ == SyncSetupWizard::SYNC_EVERYTHING ||
              current_state_ == SyncSetupWizard::CONFIGURE ||
              current_state_ == SyncSetupWizard::ENTER_PASSPHRASE;
     case SyncSetupWizard::NONFATAL_ERROR:  // Intentionally fall through.
     case SyncSetupWizard::FATAL_ERROR:
       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;
     default:
       NOTREACHED() << "Unhandled State: " << state;
       return false;
   }
 }
 
 void SyncSetupFlow::ActivateState(SyncSetupWizard::State state) {
@@ skipping 70 matching lines @@
       current_state_ = SyncSetupWizard::GAIA_LOGIN;
       flow_handler_->ShowGaiaLogin(args);
       break;
     }
     case SyncSetupWizard::DONE:
     case SyncSetupWizard::ABORT:
       flow_handler_->ShowSetupDone(UTF8ToUTF16(
           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;
   }
 }