Allow signin to continue even if sync is disabled by policy.

chrome/browser/signin/signin_tracker.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/signin/signin_tracker.h"
 
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/signin_manager.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/signin/token_service.h"
@@ skipping 111 matching lines @@
 void SigninTracker::OnStateChanged() {
   HandleServiceStateChange();
 }
 
 void SigninTracker::HandleServiceStateChange() {
   if (state_ != SERVICES_INITIALIZING) {
     // Ignore service updates until after our GAIA credentials are validated.
     return;
   }
 
-  if (SigninManagerFactory::GetForProfile(profile_)->
-      GetAuthenticatedUsername().empty()) {
+  SigninManager* signin = SigninManagerFactory::GetForProfile(profile_);
+  if (signin->GetAuthenticatedUsername().empty()) {
     // User is signed out, trigger a signin failure.
     state_ = WAITING_FOR_GAIA_VALIDATION;
     observer_->SigninFailed(
         GoogleServiceAuthError(GoogleServiceAuthError::REQUEST_CANCELED));
     return;
   }
 
   // Wait until all of our services are logged in. For now this just means sync.
   // Long term, we should separate out service auth failures from the signin
   // process, but for the current UI flow we'll validate service signin status
   // also.
-  // TODO(atwilson): Move the code to wait for app notification oauth tokens out
-  // of ProfileSyncService and over to here (http://crbug.com/114209).
-  ProfileSyncService* service =
-      ProfileSyncServiceFactory::GetForProfile(profile_);
-  if (service->waiting_for_auth()) {
+  ProfileSyncService* service = profile_->IsSyncAccessible() ?
+      ProfileSyncServiceFactory::GetForProfile(profile_) : NULL;
+  if (service && service->waiting_for_auth()) {
     // Still waiting for an auth token to come in so stay in the INITIALIZING
     // state (we do this to avoid triggering an early signin error in the case
     // where there's a previous auth error in the sync service that hasn't
     // been cleared yet).
     return;
   }
 
   // If we haven't loaded all our service tokens yet, just exit (we'll be called
   // again when another token is loaded, or will transition to SigninFailed if
   // the loading fails).
   if (!AreServiceTokensLoaded(profile_))
     return;
   if (!AreServicesSignedIn(profile_)) {
     state_ = WAITING_FOR_GAIA_VALIDATION;
-    observer_->SigninFailed(service->GetAuthError());
-  } else if (service->sync_initialized()) {
+    observer_->SigninFailed(signin->signin_global_error()->GetLastAuthError());
+  } else if (!service || service->sync_initialized()) {
     state_ = SIGNIN_COMPLETE;
     observer_->SigninSuccess();
   }
 }
 
 // static
 bool SigninTracker::AreServiceTokensLoaded(Profile* profile) {
   // See if we have all of the tokens required.
   TokenService* token_service = TokenServiceFactory::GetForProfile(profile);
   for (int i = 0; i < kNumSignedInServices; ++i) {
     if (!token_service->HasTokenForService(kSignedInServices[i])) {
       // Don't have a token for one of our signed-in services.
       return false;
     }
   }
   return true;
 }
 
 // static
 bool SigninTracker::AreServicesSignedIn(Profile* profile) {
   if (!AreServiceTokensLoaded(profile))
     return false;
+  // Don't care about the sync state if sync is disabled by policy.
+  if (!profile->IsSyncAccessible())
+    return true;
   ProfileSyncService* service =
       ProfileSyncServiceFactory::GetForProfile(profile);
   return (service->IsSyncEnabledAndLoggedIn() &&
           service->IsSyncTokenAvailable() &&
           service->GetAuthError().state() == GoogleServiceAuthError::NONE &&
           !service->HasUnrecoverableError());
 }