[Sync] Fix auth error handling while the backend is initializing.

chrome/browser/sync/profile_sync_service.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/profile_sync_service.h"
 
 #include <cstddef>
 #include <map>
 #include <set>
 #include <utility>
@@ skipping 260 matching lines @@
   // the process of setting up now, we should start the backend to download
   // account control state / encryption information). If autostart is enabled,
   // but we haven't completed sync setup, we try to start sync anyway, since
   // it's possible we crashed/shutdown after logging in but before the backend
   // finished initializing the last time.
   if (!HasSyncSetupCompleted() && !setup_in_progress_ && !auto_start_enabled_)
     return;
 
   // All systems Go for launch.
   StartUp();
-
 }
 
 void ProfileSyncService::StartSyncingWithServer() {
   if (backend_.get())
     backend_->StartSyncingWithServer();
 }
 
 void ProfileSyncService::RegisterAuthNotifications() {
   TokenService* token_service = TokenServiceFactory::GetForProfile(profile_);
   registrar_.Add(this,
@@ skipping 123 matching lines @@
 
 void ProfileSyncService::OnSyncConfigureDone(
     DataTypeManager::ConfigureResult result) {
   if (failed_datatypes_handler_.UpdateFailedDatatypes(result.failed_data_types,
           FailedDatatypesHandler::STARTUP)) {
     ReconfigureDatatypeManager();
   }
 }
 
 void ProfileSyncService::OnSyncConfigureRetry() {
-  // In platforms with auto start we would just wait for the
-  // configure to finish. In other platforms we would throw
-  // an unrecoverable error. The reason we do this is so that
-  // the login dialog would show an error and the user would have
-  // to relogin.
-  // Also if backend has been initialized(the user is authenticated
-  // and nigori is downloaded) we would simply wait rather than going into
-  // unrecoverable error, even if the platform has auto start disabled.
-  // Note: In those scenarios the UI does not wait for the configuration
-  // to finish.
-  if (!auto_start_enabled_ && !backend_initialized_) {
-    OnInternalUnrecoverableError(FROM_HERE,
-                                 "Configure failed to download.",
-                                 true,
-                                 ERROR_REASON_CONFIGURATION_RETRY);
-  }
-
+  // Note: in order to handle auth failures that arise before the backend is
+  // initialized (e.g. from invalidation notifier, or downloading new control
+  // types), we have to gracefully handle configuration retries at all times.
+  // At this point an auth error badge should be shown, which once resolved
+  // will trigger a new sync cycle.
   NotifyObservers();
 }
 
 
 void ProfileSyncService::StartUp() {
   // Don't start up multiple times.
   if (backend_.get()) {
     DVLOG(1) << "Skipping bringing up backend host.";
     return;
   }
@@ skipping 1317 matching lines @@
               details).ptr());
       if (!IsTokenServiceRelevant(token_details.service()))
         break;
     } // Fall through.
     case chrome::NOTIFICATION_TOKEN_LOADING_FINISHED: {
       // This notification gets fired when TokenService loads the tokens
       // from storage.
       // Initialize the backend if sync is enabled. If the sync token was
       // not loaded, GetCredentials() will generate invalid credentials to
       // cause the backend to generate an auth error (crbug.com/121755).
-      if (backend_initialized_)
+      if (backend_.get())
         backend_->UpdateCredentials(GetCredentials());
       else
         TryStart();
       break;
     }
     default: {
       NOTREACHED();
     }
   }
 }
@@ skipping 116 matching lines @@
   // See http://stackoverflow.com/questions/6224121/is-new-this-myclass-undefined-behaviour-after-directly-calling-the-destru.
   ProfileSyncService* old_this = this;
   this->~ProfileSyncService();
   new(old_this) ProfileSyncService(
       new ProfileSyncComponentsFactoryImpl(profile,
                                            CommandLine::ForCurrentProcess()),
       profile,
       signin,
       behavior);
 }