Use OAuth2 token for 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/signin_manager.h"
 #include "chrome/browser/signin/signin_manager_factory.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 "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "google_apis/gaia/gaia_constants.h"
 
 static const char* kSignedInServices[] = {
   GaiaConstants::kSyncService,

[Andrew T Wilson (Slow), 2013/06/07 13:04:42]

BTW, should we stop fetching the kSyncService token and stop checking for it
here? Or do we need to leave it in place for other platforms?

   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),
@@ skipping 137 matching lines @@
     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);
   // Check the sync service state - we ignore CONNECTION_FAILED errors here
   // because they are transient and do not signify a failure of the signin
   // process.
   return (service->IsSyncEnabledAndLoggedIn() &&
-          service->IsSyncTokenAvailable() &&
+          service->IsOAuthRefreshTokenAvailable() &&
           (service->GetAuthError().state() == GoogleServiceAuthError::NONE ||
            service->GetAuthError().state() ==
                GoogleServiceAuthError::CONNECTION_FAILED) &&
           !service->HasUnrecoverableError());
 }
 
 // static
 SigninTracker::LoginState SigninTracker::GetSigninState(
     Profile* profile,
     GoogleServiceAuthError* error) {
@@ skipping 28 matching lines @@
     if (error)
       *error = signin->signin_global_error()->GetLastAuthError();
     return WAITING_FOR_GAIA_VALIDATION;
   }
 
   if (!service || service->sync_initialized())
     return SIGNIN_COMPLETE;
 
   return SERVICES_INITIALIZING;
 }