WalletClient: don't bother queuing requests; we don't make multiple requests concurrently anyway

components/autofill/content/browser/wallet/wallet_client.h

 // Copyright 2013 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.
 
 #ifndef COMPONENTS_AUTOFILL_CONTENT_BROWSER_WALLET_WALLET_CLIENT_H_
 #define COMPONENTS_AUTOFILL_CONTENT_BROWSER_WALLET_WALLET_CLIENT_H_
 
 #include <queue>
 #include <string>
 #include <vector>
@@ skipping 160 matching lines @@
   // and address to be updated on the server (and should be NULL if |instrument|
   // or |address| are new data).
   virtual void SaveToWallet(
       scoped_ptr<Instrument> instrument,
       scoped_ptr<Address> address,
       const WalletItems::MaskedInstrument* reference_instrument,
       const Address* reference_address);
 
   bool HasRequestInProgress() const;
 
-  // Cancels and clears the current |request_| and |pending_requests_| (if any).
-  void CancelRequests();
+  // Cancels and clears the current |request_|.
+  void CancelRequest();
 
   // Sets the user index and cancels any pending requests.
   void SetUserIndex(size_t user_index);
   size_t user_index() const { return user_index_; }
 
  private:
   FRIEND_TEST_ALL_PREFIXES(WalletClientTest, PendingRequest);
   FRIEND_TEST_ALL_PREFIXES(WalletClientTest, CancelRequests);
 
   enum RequestType {
-    NO_PENDING_REQUEST,
+    NO_REQUEST,
     ACCEPT_LEGAL_DOCUMENTS,
     AUTHENTICATE_INSTRUMENT,
     GET_FULL_WALLET,
     GET_WALLET_ITEMS,
     SAVE_TO_WALLET,
   };
 
   // Like AcceptLegalDocuments, but takes a vector of document ids.
   void DoAcceptLegalDocuments(
       const std::vector<std::string>& document_ids,
       const std::string& google_transaction_id);
 
   // Posts |post_body| to |url| with content type |mime_type| and notifies
   // |delegate_| when the request is complete.
   void MakeWalletRequest(const GURL& url,
                          const std::string& post_body,
                          const std::string& mime_type,
                          RequestType request_type);
 
   // Performs bookkeeping tasks for any invalid requests.
   void HandleMalformedResponse(RequestType request_type,
                                net::URLFetcher* request);
   void HandleNetworkError(int response_code);
   void HandleWalletError(ErrorType error_type);
 
-  // Start the next pending request (if any).
-  void StartNextPendingRequest();
-
   // net::URLFetcherDelegate:
   virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE;
 
   // Logs an UMA metric for each of the |required_actions|.
   void LogRequiredActions(
       const std::vector<RequiredAction>& required_actions) const;
 
   // Converts |request_type| to an UMA metric.
   AutofillMetrics::WalletApiCallMetric RequestTypeToUmaMetric(
       RequestType request_type) const;
 
   // The context for the request. Ensures the gdToken cookie is set as a header
   // in the requests to Online Wallet if it is present.
   scoped_refptr<net::URLRequestContextGetter> context_getter_;
 
   // Observer class that has its various On* methods called based on the results
   // of a request to Online Wallet.
   WalletClientDelegate* const delegate_;  // must outlive |this|.
 
   // The index of the user account we're making requests for. The index is into
   // GAIA's list of signed in users.
   size_t user_index_;
 
   // The URL of the page we're making requests on behalf of.
   GURL source_url_;
 
   // The current request object.
   scoped_ptr<net::URLFetcher> request_;
 
-  // The type of the current request. Must be NO_PENDING_REQUEST for a request
+  // The type of the current request. Must be NO_REQUEST for a request
   // to be initiated as only one request may be running at a given time.
   RequestType request_type_;
 
   // The one time pad used for GetFullWallet encryption.
   std::vector<uint8> one_time_pad_;
 
-  // Requests that are waiting to be run.
-  std::queue<base::Closure> pending_requests_;
-
   // When the current request started. Used to track client side latency.
   base::Time request_started_timestamp_;
 
   base::WeakPtrFactory<WalletClient> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(WalletClient);
 };
 
 }  // namespace wallet
 }  // namespace autofill
 
 #endif  // COMPONENTS_AUTOFILL_CONTENT_BROWSER_WALLET_WALLET_CLIENT_H_