Added OAuth support to TokenService

chrome/browser/sync/signin_manager.cc

 // Copyright (c) 2011 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/signin_manager.h"
 
 #include "base/command_line.h"
 #include "base/string_util.h"
 #include "chrome/browser/net/gaia/token_service.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/net/gaia/gaia_constants.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/common/notification_service.h"
 
 const char kGetInfoEmailKey[] = "email";
 
-const char kSyncOAuth2Scope[] = "https://www.googleapis.com/auth/chromesync";
-
 SigninManager::SigninManager()
     : profile_(NULL), had_two_factor_error_(false) {}
 
 SigninManager::~SigninManager() {}
 
 // static
 void SigninManager::RegisterUserPrefs(PrefService* user_prefs) {
   user_prefs->RegisterStringPref(prefs::kGoogleServicesUsername,
                                  "",
                                  PrefService::UNSYNCABLE_PREF);
@@ skipping 44 matching lines @@
   DCHECK(!profile_->GetTokenService()->AreCredentialsValid());
 #endif
 }
 
 // Users must always sign out before they sign in again.
 void SigninManager::StartOAuthSignIn() {
   PrepareForSignin();
   oauth_login_.reset(new GaiaOAuthFetcher(this,
                                           profile_->GetRequestContext(),
                                           profile_,
-                                          GaiaConstants::kSyncService,
-                                          kSyncOAuth2Scope));
+                                          GaiaConstants::kSyncServiceOAuth));
   oauth_login_->StartGetOAuthToken();
 }
 
 // Users must always sign out before they sign in again.
 void SigninManager::StartSignIn(const std::string& username,
                                 const std::string& password,
                                 const std::string& login_token,
                                 const std::string& login_captcha) {
   PrepareForSignin();
   username_.assign(username);
@@ skipping 139 matching lines @@
   VLOG(1) << "SigninManager::OnOAuthGetAccessTokenFailure";
 }
 
 void SigninManager::OnOAuthWrapBridgeSuccess(const std::string& service_name,
                                              const std::string& token,
                                              const std::string& expires_in) {
   VLOG(1) << "SigninManager::OnOAuthWrapBridgeSuccess";
 }
 
 void SigninManager::OnOAuthWrapBridgeFailure(
+    const std::string& service_scope,
     const GoogleServiceAuthError& error) {
   VLOG(1) << "SigninManager::OnOAuthWrapBridgeFailure";
 }
 
 void SigninManager::OnUserInfoSuccess(const std::string& email) {
   VLOG(1) << "SigninManager::OnUserInfoSuccess(\"" << email << "\")";
 }
 
 void SigninManager::OnUserInfoFailure(const GoogleServiceAuthError& error) {
   VLOG(1) << "SigninManager::OnUserInfoFailure";
@@ skipping 16 matching lines @@
                                               profile_->GetRequestContext()));
     }
 
     client_login_->StartTokenAuth(tok_details->token());
 
     // We only want to do this once per sign-in.
     CleanupNotificationRegistration();
   }
 #endif
 }