Merge 130722 - On ChromeOS, the user is always signed in and we should not

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),
       profile_(profile),
       observer_(observer),
       credentials_valid_(false) {
+  Initialize();
+}
+
+SigninTracker::SigninTracker(Profile* profile,
+                             Observer* observer,
+                             LoginState state)
+    : state_(state),
+      profile_(profile),
+      observer_(observer),
+      credentials_valid_(false) {
+  Initialize();
+}
+
+SigninTracker::~SigninTracker() {
+  ProfileSyncServiceFactory::GetForProfile(profile_)->RemoveObserver(this);
+}
+
+void SigninTracker::Initialize() {
   DCHECK(observer_);
   // Register for notifications from the SigninManager.
   registrar_.Add(this,
                  chrome::NOTIFICATION_GOOGLE_SIGNIN_SUCCESSFUL,
                  content::Source<Profile>(profile_));
   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);
-}
 
-SigninTracker::~SigninTracker() {
-  ProfileSyncService* service =
-      ProfileSyncServiceFactory::GetForProfile(profile_);
-  service->RemoveObserver(this);
+  if (state_ == SERVICES_INITIALIZING)
+    HandleServiceStateChange();
 }
 
 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:
       DCHECK_EQ(state_, WAITING_FOR_GAIA_VALIDATION);
       state_ = SERVICES_INITIALIZING;
@@ skipping 89 matching lines @@
 // static
 bool SigninTracker::AreServicesSignedIn(Profile* profile) {
   if (!AreServiceTokensLoaded(profile))
     return false;
   ProfileSyncService* service =
       ProfileSyncServiceFactory::GetForProfile(profile);
   return (service->AreCredentialsAvailable() &&
           service->GetAuthError().state() == GoogleServiceAuthError::NONE &&
           !service->unrecoverable_error_detected());
 }
-