gdata: Rename functions in GDataAuthService per OAuth2 terminology

chrome/browser/chromeos/gdata/gdata_auth_service.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/gdata/gdata_auth_service.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/message_loop_proxy.h"
@@ skipping 37 matching lines @@
 
 GDataAuthService::~GDataAuthService() {
 }
 
 void GDataAuthService::StartAuthentication(
     GDataOperationRegistry* registry,
     const AuthStatusCallback& callback) {
   scoped_refptr<base::MessageLoopProxy> relay_proxy(
       base::MessageLoopProxy::current());
 
-  if (IsFullyAuthenticated()) {
+  if (HasAccessToken()) {
     relay_proxy->PostTask(FROM_HERE,
-         base::Bind(callback, gdata::HTTP_SUCCESS, oauth2_auth_token()));
-  } else if (IsPartiallyAuthenticated()) {
+         base::Bind(callback, gdata::HTTP_SUCCESS, access_token_));
+  } else if (HasRefreshToken()) {
     BrowserThread::PostTask(
         BrowserThread::UI,
         FROM_HERE,
         base::Bind(&GDataAuthService::StartAuthenticationOnUIThread,
                    weak_ptr_bound_to_ui_thread_,
                    registry,
                    relay_proxy,
                    base::Bind(&GDataAuthService::OnAuthCompleted,
                               weak_ptr_bound_to_ui_thread_,
                               relay_proxy,
                               callback)));
   } else {
     relay_proxy->PostTask(FROM_HERE,
         base::Bind(callback, gdata::HTTP_UNAUTHORIZED, std::string()));
   }
 }
 
 void GDataAuthService::StartAuthenticationOnUIThread(
     GDataOperationRegistry* registry,
     scoped_refptr<base::MessageLoopProxy> relay_proxy,
     const AuthStatusCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   // We have refresh token, let's gets authenticated.
   (new AuthOperation(registry, profile_,
-                     callback, GetOAuth2RefreshToken()))->Start();
+                     callback, refresh_token_))->Start();
 }
 
 void GDataAuthService::OnAuthCompleted(
     scoped_refptr<base::MessageLoopProxy> relay_proxy,
     const AuthStatusCallback& callback,
     GDataErrorCode error,
-    const std::string& auth_token) {
+    const std::string& access_token) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   if (error == HTTP_SUCCESS)
-    auth_token_ = auth_token;
+    access_token_ = access_token;
 
   // TODO(zelidrag): Add retry, back-off logic when things go wrong here.
   if (!callback.is_null())
-    relay_proxy->PostTask(FROM_HERE, base::Bind(callback, error, auth_token));
+    relay_proxy->PostTask(FROM_HERE, base::Bind(callback, error, access_token));
 }
 
 void GDataAuthService::AddObserver(Observer* observer) {
   observers_.AddObserver(observer);
 }
 
 void GDataAuthService::RemoveObserver(Observer* observer) {
   observers_.RemoveObserver(observer);
 }
 
 void GDataAuthService::Observe(int type,
                                const content::NotificationSource& source,
                                const content::NotificationDetails& details) {
   DCHECK(type == chrome::NOTIFICATION_TOKEN_AVAILABLE ||
          type == chrome::NOTIFICATION_TOKEN_REQUEST_FAILED);
 
   TokenService::TokenAvailableDetails* token_details =
       content::Details<TokenService::TokenAvailableDetails>(details).ptr();
   if (token_details->service() != GaiaConstants::kGaiaOAuth2LoginRefreshToken)
     return;
 
-  auth_token_.clear();
+  access_token_.clear();
   if (type == chrome::NOTIFICATION_TOKEN_AVAILABLE) {
     TokenService* service = TokenServiceFactory::GetForProfile(profile_);
     refresh_token_ = service->GetOAuth2LoginRefreshToken();
   } else {
     refresh_token_.clear();
   }
   FOR_EACH_OBSERVER(Observer, observers_, OnOAuth2RefreshTokenChanged());
 }
 
 }  // namespace gdata