Merge 138735 - No longer trigger SyncCredentialsLost flow on cros.

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 188 matching lines @@
 }
 
 void ProfileSyncService::TryStart() {
   if (!IsSyncEnabledAndLoggedIn())
     return;
   TokenService* token_service = TokenServiceFactory::GetForProfile(profile_);
   if (!token_service)
     return;
   // Don't start the backend if the token service hasn't finished loading tokens
   // yet (if the backend is started before the sync token has been loaded,
-  // GetCredentials() will return bogus credentials).
-  if (IsSyncTokenAvailable() || token_service->TokensLoadedFromDB()) {
+  // GetCredentials() will return bogus credentials). On auto_start platforms
+  // (like ChromeOS) we don't start sync until tokens are loaded, because the
+  // user can be "signed in" on those platforms long before the tokens get
+  // loaded, and we don't want to generate spurious auth errors.
+  if (IsSyncTokenAvailable() ||
+      (!auto_start_enabled_ && token_service->TokensLoadedFromDB())) {
     if (HasSyncSetupCompleted() || auto_start_enabled_) {
       // If sync setup has completed we always start the backend.
       // 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.
       // Note that if we haven't finished setting up sync, backend bring up will
       // be done by the wizard.
       StartUp();
     }
   }
@@ skipping 1317 matching lines @@
           backend_->UpdateCredentials(GetCredentials());
         else
           StartUp();
       }
       break;
     }
     case chrome::NOTIFICATION_TOKEN_LOADING_FINISHED: {
       // This notification gets fired when TokenService loads the tokens
       // from storage.
       if (IsSyncEnabledAndLoggedIn()) {
+        // Don't start up sync and generate an auth error on auto_start
+        // platforms as they have their own way to resolve TokenService errors.
+        // (crbug.com/128592).
+        if (auto_start_enabled_ && !IsSyncTokenAvailable())
+          break;
+
         // 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_)
           backend_->UpdateCredentials(GetCredentials());
         else
           StartUp();
       }
       break;
     }
@@ skipping 103 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);
 }