Merge 176800

chrome/browser/chromeos/login/online_attempt.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/chromeos/login/online_attempt.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 153 matching lines @@
   if (using_oauth_) {
     if (!attempt_->oauth1_access_token().length() ||
         !attempt_->oauth1_access_secret().length()) {
       // Empty OAuth1 access token and secret probably means that we are
       // dealing with a legacy ChromeOS account. This should be treated as
       // invalid/expired token.
       OnClientLoginFailure(GoogleServiceAuthError(
           GoogleServiceAuthError::INVALID_GAIA_CREDENTIALS));
     } else {
       oauth_fetcher_->StartOAuthLogin(GaiaConstants::kChromeOSSource,
-                                      GaiaConstants::kPicasaService,
+                                      GaiaConstants::kSyncService,
                                       attempt_->oauth1_access_token(),
                                       attempt_->oauth1_access_secret());
     }
   } else {
     client_fetcher_->StartClientLogin(
         attempt_->username,
         attempt_->password,
-        GaiaConstants::kPicasaService,
+        GaiaConstants::kSyncService,
         attempt_->login_token,
         attempt_->login_captcha,
         attempt_->hosted_policy());
   }
 }
 
 bool OnlineAttempt::HasPendingFetch() {
   return using_oauth_ ? oauth_fetcher_->HasPendingFetch() :
       client_fetcher_->HasPendingFetch();
 }
@@ skipping 14 matching lines @@
 
 void OnlineAttempt::TriggerResolve(
     const LoginFailure& outcome) {
   attempt_->RecordOnlineLoginStatus(outcome);
   client_fetcher_.reset(NULL);
   oauth_fetcher_.reset(NULL);
   resolver_->Resolve();
 }
 
 }  // namespace chromeos