Revive reverted CL with fix for CrOS build.

chrome/common/net/gaia/oauth2_access_token_fetcher.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/common/net/gaia/oauth2_access_token_fetcher.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/json/json_reader.h"
@@ skipping 98 matching lines @@
       this));
   fetcher_->Start();  // OnURLFetchComplete will be called.
 }
 
 void OAuth2AccessTokenFetcher::EndGetAccessToken(const URLFetcher* source) {
   CHECK_EQ(GET_ACCESS_TOKEN_STARTED, state_);
   state_ = GET_ACCESS_TOKEN_DONE;
 
   URLRequestStatus status = source->GetStatus();
   if (!status.is_success()) {
-    ReportFailure(CreateAuthError(status));
+    OnGetTokenFailure(CreateAuthError(status));
     return;
   }
 
   if (source->GetResponseCode() != RC_REQUEST_OK) {
-    ReportFailure(GoogleServiceAuthError(
+    OnGetTokenFailure(GoogleServiceAuthError(
         GoogleServiceAuthError::INVALID_GAIA_CREDENTIALS));
     return;
   }
 
   // The request was successfully fetched and it returned OK.
   // Parse out the access token.
   std::string access_token;
-  if (!ParseGetAccessTokenResponse(source, &access_token)) {
-    ReportFailure(GoogleServiceAuthError(
-        GoogleServiceAuthError::UNEXPECTED_RESPONSE));
-    return;
-  }
-
-  ReportSuccess(access_token);
+  ParseGetAccessTokenResponse(source, &access_token);
+  OnGetTokenSuccess(access_token);
 }
 
-void OAuth2AccessTokenFetcher::ReportSuccess(const std::string& access_token) {
+void OAuth2AccessTokenFetcher::OnGetTokenSuccess(
+    const std::string& access_token) {
   consumer_->OnGetTokenSuccess(access_token);
 }
 
-void OAuth2AccessTokenFetcher::ReportFailure(GoogleServiceAuthError error) {
+void OAuth2AccessTokenFetcher::OnGetTokenFailure(GoogleServiceAuthError error) {
   state_ = ERROR_STATE;
   consumer_->OnGetTokenFailure(error);
 }
 
 void OAuth2AccessTokenFetcher::OnURLFetchComplete(const URLFetcher* source) {
   CHECK(source);
   CHECK(state_ == GET_ACCESS_TOKEN_STARTED);
   EndGetAccessToken(source);
 }
 
@@ skipping 24 matching lines @@
   std::string data;
   source->GetResponseAsString(&data);
   base::JSONReader reader;
   scoped_ptr<base::Value> value(reader.Read(data, false));
   if (!value.get() || value->GetType() != base::Value::TYPE_DICTIONARY)
     return false;
 
   DictionaryValue* dict = static_cast<DictionaryValue*>(value.get());
   return GetStringFromDictionary(dict, kAccessTokenKey, access_token);
 }