Added OAuth support to TokenService

chrome/browser/chromeos/login/online_attempt.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/chromeos/login/online_attempt.h"
 
 #include <string>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/login/auth_attempt_state.h"
 #include "chrome/browser/chromeos/login/auth_attempt_state_resolver.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/net/gaia/gaia_auth_consumer.h"
 #include "chrome/common/net/gaia/gaia_auth_fetcher.h"
 #include "chrome/common/net/gaia/gaia_constants.h"
 #include "content/browser/browser_thread.h"
 #include "net/base/load_flags.h"
 #include "net/base/net_errors.h"
 #include "net/url_request/url_request_status.h"
 #include "third_party/libjingle/source/talk/base/urlencode.h"
 
 namespace {
 
 // The service scope of the OAuth v2 token that ChromeOS login will be
 // requesting.
-const char kServiceScopeChromeOS[] =
-    "https://www.googleapis.com/auth/chromesync";
+const char* kServiceScopeChromeOS = GaiaConstants::kSyncServiceOAuth;
 
 }
 
 namespace chromeos {
 
 // static
 const int OnlineAttempt::kClientLoginTimeoutMs = 10000;
 
 OnlineAttempt::OnlineAttempt(bool using_oauth,
                              AuthAttemptState* current_attempt,
@@ skipping 15 matching lines @@
     oauth_fetcher_->CancelRequest();
 }
 
 void OnlineAttempt::Initiate(Profile* auth_profile) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (using_oauth_) {
     oauth_fetcher_.reset(
         new GaiaOAuthFetcher(this,
                              auth_profile->GetRequestContext(),
                              auth_profile,
-                             GaiaConstants::kSyncService,
                              kServiceScopeChromeOS));
   } else {
     client_fetcher_.reset(
         new GaiaAuthFetcher(this, GaiaConstants::kChromeOSSource,
                             auth_profile->GetRequestContext()));
   }
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       NewRunnableMethod(this, &OnlineAttempt::TryClientLogin));
 }
@@ skipping 138 matching lines @@
 void OnlineAttempt::TriggerResolve(
     const GaiaAuthConsumer::ClientLoginResult& credentials,
     const LoginFailure& outcome) {
   attempt_->RecordOnlineLoginStatus(credentials, outcome);
   client_fetcher_.reset(NULL);
   oauth_fetcher_.reset(NULL);
   resolver_->Resolve();
 }
 
 }  // namespace chromeos