Revert 190531 "Get OAuth2TokenService working on Android."

trunk/src/chrome/browser/history/web_history_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/history/web_history_service.h"
 
 #include "base/bind.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 46 matching lines @@
   friend class history::WebHistoryService;
 
   typedef base::Callback<void(Request*, bool)> CompletionCallback;
 
   RequestImpl(Profile* profile,
               const std::string& url,
               const CompletionCallback& callback)
       : profile_(profile),
         url_(GURL(url)),
         response_code_(0),
-        auth_retry_count_(0),
         callback_(callback) {
   }
 
   // Tells the request to do its thang.
   void Start() {
     OAuth2TokenService::ScopeSet oauth_scopes;
     oauth_scopes.insert(kHistoryOAuthScope);
 
     OAuth2TokenService* token_service =
         OAuth2TokenServiceFactory::GetForProfile(profile_);
     token_request_ = token_service->StartRequest(oauth_scopes, this);
   }
 
   // content::URLFetcherDelegate interface.
   virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE {
     DCHECK_EQ(source, url_fetcher_.get());
     response_code_ = url_fetcher_->GetResponseCode();
-
-    // If the response code indicates that the token might not be valid,
-    // invalidate the token and try again.
-    if (response_code_ == net::HTTP_UNAUTHORIZED && ++auth_retry_count_ <= 1) {
-      OAuth2TokenService::ScopeSet oauth_scopes;
-      oauth_scopes.insert(kHistoryOAuthScope);
-      OAuth2TokenServiceFactory::GetForProfile(profile_)->InvalidateToken(
-          oauth_scopes, access_token_);
-
-      access_token_ = std::string();
-      Start();
-      return;
-    }
     url_fetcher_->GetResponseAsString(&response_body_);
     url_fetcher_.reset();
     callback_.Run(this, true);
   }
 
   // OAuth2TokenService::Consumer interface.
   virtual void OnGetTokenSuccess(
       const OAuth2TokenService::Request* request,
       const std::string& access_token,
       const base::Time& expiration_time) OVERRIDE {
     token_request_.reset();
     DCHECK(!access_token.empty());
-    access_token_ = access_token;
 
     // Got an access token -- start the actual API request.
     url_fetcher_.reset(CreateUrlFetcher(access_token));
     url_fetcher_->Start();
   }
 
   virtual void OnGetTokenFailure(
       const OAuth2TokenService::Request* request,
       const GoogleServiceAuthError& error) OVERRIDE {
     token_request_.reset();
@@ skipping 27 matching lines @@
 
   // The URL of the API endpoint.
   GURL url_;
 
   // POST data to be sent with the request (may be empty).
   std::string post_data_;
 
   // The OAuth2 access token request.
   scoped_ptr<OAuth2TokenService::Request> token_request_;
 
-  // The current OAuth2 access token.
-  std::string access_token_;
-
   // Handles the actual API requests after the OAuth token is acquired.
   scoped_ptr<net::URLFetcher> url_fetcher_;
 
   // Holds the response code received from the server.
   int response_code_;
 
   // Holds the response body received from the server.
   std::string response_body_;
 
-  // The number of times this request has already been retried due to
-  // authorization problems.
-  int auth_retry_count_;
-
   // The callback to execute when the query is complete.
   CompletionCallback callback_;
 };
 
 // Called when a query to web history has completed, successfully or not.
 void QueryHistoryCompletionCallback(
     const WebHistoryService::QueryWebHistoryCallback& callback,
     WebHistoryService::Request* request,
     bool success) {
   RequestImpl* request_impl = static_cast<RequestImpl*>(request);
@@ skipping 134 matching lines @@
     base::Time end_time,
     const ExpireWebHistoryCallback& callback) {
   std::vector<ExpireHistoryArgs> expire_list(1);
   expire_list.back().urls = restrict_urls;
   expire_list.back().begin_time = begin_time;
   expire_list.back().end_time = end_time;
   return ExpireHistory(expire_list, callback);
 }
 
 }  // namespace history