suppress user/password dialog when re-enabling sync

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/token_service.h"
 #include "chrome/browser/signin/token_service_factory.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/net/gaia/gaia_constants.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 
 static const char* kSignedInServices[] = {
   GaiaConstants::kSyncService,
   GaiaConstants::kGaiaOAuth2LoginRefreshToken
 };
 static const int kNumSignedInServices =
     arraysize(kSignedInServices);
 
 // Helper to check if the given token service is relevant for sync.
 SigninTracker::SigninTracker(Profile* profile, Observer* observer)
-    : state_(WAITING_FOR_GAIA_VALIDATION),
+    :
+#if !defined(OS_CHROMEOS)
+      state_(WAITING_FOR_GAIA_VALIDATION),
+#else
+      state_(SERVICES_INITIALIZING),
+#endif
       profile_(profile),
       observer_(observer),
       credentials_valid_(false) {
   DCHECK(observer_);
   // Register for notifications from the SigninManager.
+  // On ChromeOS, we don't register sign in notification because we don't
+  // use it in SyncSetupHandler.
+#if !defined(OS_CHROMEOS)
   registrar_.Add(this,
                  chrome::NOTIFICATION_GOOGLE_SIGNIN_SUCCESSFUL,
                  content::Source<Profile>(profile_));
+#endif
   registrar_.Add(this,
                  chrome::NOTIFICATION_GOOGLE_SIGNIN_FAILED,
                  content::Source<Profile>(profile_));
   TokenService* token_service = TokenServiceFactory::GetForProfile(profile_);
   registrar_.Add(this,
                  chrome::NOTIFICATION_TOKEN_AVAILABLE,
                  content::Source<TokenService>(token_service));
   registrar_.Add(this,
                  chrome::NOTIFICATION_TOKEN_REQUEST_FAILED,
                  content::Source<TokenService>(token_service));
 
   // Also listen for notifications from the various signed in services (only
   // sync for now).
   ProfileSyncService* service =
       ProfileSyncServiceFactory::GetForProfile(profile_);
   service->AddObserver(this);
+
+#if defined(OS_CHROMEOS)
+  DCHECK_EQ(state_, SERVICES_INITIALIZING);
+  HandleServiceStateChange();
+#endif
 }
 
 SigninTracker::~SigninTracker() {
   ProfileSyncService* service =
       ProfileSyncServiceFactory::GetForProfile(profile_);
   service->RemoveObserver(this);
 }
 
 void SigninTracker::Observe(int type,
                             const content::NotificationSource& source,
                             const content::NotificationDetails& details) {
   // We should not get more than one of these notifications.
   switch (type) {
     case chrome::NOTIFICATION_GOOGLE_SIGNIN_SUCCESSFUL:
+      LOG(WARNING) << "Got NOTIFICATION_GOOGLE_SIGNIN_SUCCESSFUL";
       DCHECK_EQ(state_, WAITING_FOR_GAIA_VALIDATION);
       state_ = SERVICES_INITIALIZING;
       observer_->GaiaCredentialsValid();
       // If our services are already signed in, see if it's possible to
       // transition to the SIGNIN_COMPLETE state.
       if (AreServicesSignedIn(profile_))
         HandleServiceStateChange();
       break;
     case chrome::NOTIFICATION_GOOGLE_SIGNIN_FAILED: {
+      LOG(WARNING) << "Got NOTIFICATION_GOOGLE_SIGNIN_FAILED";
       DCHECK_EQ(state_, WAITING_FOR_GAIA_VALIDATION);
       const GoogleServiceAuthError& error =
           *(content::Details<const GoogleServiceAuthError>(details).ptr());
       observer_->SigninFailed(error);
       break;
     }
     case chrome::NOTIFICATION_TOKEN_AVAILABLE:
+      LOG(WARNING) << "Got NOTIFICATION_TOKEN_AVAILABLE";
       // A new token is available - check to see if we're all signed in now.
       HandleServiceStateChange();
       break;
     case chrome::NOTIFICATION_TOKEN_REQUEST_FAILED:
+      LOG(WARNING) << "Got NOTIFICATION_TOKEN_REQUEST_FAILED";
       if (state_ == SERVICES_INITIALIZING) {
         const TokenService::TokenRequestFailedDetails& token_details =
             *(content::Details<const TokenService::TokenRequestFailedDetails>(
                 details).ptr());
         for (int i = 0; i < kNumSignedInServices; ++i) {
           if (token_details.service() == kSignedInServices[i]) {
             // We got an error loading one of our tokens, so notify our
             // observer.
+            LOG(WARNING) << "resetting state_ to WAITING_FOR_GAIA_VALIDATION";
             state_ = WAITING_FOR_GAIA_VALIDATION;
             observer_->SigninFailed(token_details.error());
           }
         }
       }
       break;
     default:
       NOTREACHED();
   }
 }
 
 // Called when the ProfileSyncService state changes.
 void SigninTracker::OnStateChanged() {
   HandleServiceStateChange();
 }
 
 void SigninTracker::HandleServiceStateChange() {
   if (state_ != SERVICES_INITIALIZING) {
+    LOG(WARNING) << "HandleServiceStateChange: state!=SERVICES_INITIALIZING" << (int)state_;
     // Ignore service updates until after our GAIA credentials are validated.
     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()) {
+    LOG(WARNING) << "HandleServiceStateChange: service is 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_))
+  if (!AreServiceTokensLoaded(profile_)) {
+    LOG(WARNING) << "HandleServiceStateChange: ServiceToken not loaded";
     return;
+  }
   if (!AreServicesSignedIn(profile_)) {
+    LOG(WARNING) << "HandleServiceStateChange: not signed in to services";
     state_ = WAITING_FOR_GAIA_VALIDATION;
     observer_->SigninFailed(service->GetAuthError());
   } else if (service->sync_initialized()) {
+    LOG(WARNING) << "HandleServiceStateChange: sign in complete!";
     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])) {
+      LOG(WARNING) << "Token not available for service " << 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;
   ProfileSyncService* service =
       ProfileSyncServiceFactory::GetForProfile(profile);
+  LOG(WARNING) << "AreServicesSignedIn: AreCredentialsAvailable() : " << (service->AreCredentialsAvailable() ? "YES" : "NO");
+  LOG(WARNING) << "AreServicesSignedIn: GetAuthError() : " << (int)service->GetAuthError().state();
+  LOG(WARNING) << "AreServicesSignedIn: unrecoverable error? : " << (service->unrecoverable_error_detected() ? "YES" : "NO");
   return (service->AreCredentialsAvailable() &&
           service->GetAuthError().state() == GoogleServiceAuthError::NONE &&
           !service->unrecoverable_error_detected());
 }
-