components/autofill: scoped_ptr -> unique_ptr

components/autofill/core/browser/payments/payments_client.h

 // Copyright 2015 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_CORE_BROWSER_PAYMENTS_PAYMENTS_CLIENT_H_
 #define COMPONENTS_AUTOFILL_CORE_BROWSER_PAYMENTS_PAYMENTS_CLIENT_H_
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
@@ skipping 26 matching lines @@
   // on failure.
   virtual void OnDidGetRealPan(AutofillClient::PaymentsRpcResult result,
                                const std::string& real_pan) = 0;
 
   // Returns the legal message retrieved from Payments. On failure or not
   // meeting Payments's conditions for upload, |legal_message| will contain
   // nullptr.
   virtual void OnDidGetUploadDetails(
       AutofillClient::PaymentsRpcResult result,
       const base::string16& context_token,
-      scoped_ptr<base::DictionaryValue> legal_message) = 0;
+      std::unique_ptr<base::DictionaryValue> legal_message) = 0;
 
   // Returns the result of an upload request.
   virtual void OnDidUploadCard(AutofillClient::PaymentsRpcResult result) = 0;
 };
 
 // PaymentsClient issues Payments RPCs and manages responses and failure
 // conditions. Only one request may be active at a time. Initiating a new
 // request will cancel a pending request.
 // Tests are located in
 // src/components/autofill/content/browser/wallet/payments_client_unittest.cc.
@@ skipping 54 matching lines @@
   // GetUploadDetails has not already been made.
   virtual void UploadCard(const UploadRequestDetails& details);
 
   // Cancels and clears the current |request_|.
   void CancelRequest();
 
  private:
   // Initiates a Payments request using the state in |request|. If
   // |authenticate| is true, ensures that an OAuth token is avialble first.
   // Takes ownership of |request|.
-  void IssueRequest(scoped_ptr<PaymentsRequest> request, bool authenticate);
+  void IssueRequest(std::unique_ptr<PaymentsRequest> request,
+                    bool authenticate);
 
   // net::URLFetcherDelegate:
   void OnURLFetchComplete(const net::URLFetcher* source) override;
 
   // OAuth2TokenService::Consumer implementation.
   void OnGetTokenSuccess(const OAuth2TokenService::Request* request,
                          const std::string& access_token,
                          const base::Time& expiration_time) override;
   void OnGetTokenFailure(const OAuth2TokenService::Request* request,
                          const GoogleServiceAuthError& error) override;
 
   // Creates |url_fetcher_| based on the current state of |request_|.
   void InitializeUrlFetcher();
 
   // Initiates a new OAuth2 token request.
   void StartTokenFetch(bool invalidate_old);
 
   // Adds the token to |url_fetcher_| and starts the request.
   void SetOAuth2TokenAndStartRequest();
 
   // The context for the request.
   scoped_refptr<net::URLRequestContextGetter> context_getter_;
 
   // Observer class that has its various On* methods called based on the results
   // of a Payments request.
   PaymentsClientDelegate* const delegate_;  // must outlive |this|.
 
   // The current request.
-  scoped_ptr<PaymentsRequest> request_;
+  std::unique_ptr<PaymentsRequest> request_;
 
   // The fetcher being used to issue the current request.
-  scoped_ptr<net::URLFetcher> url_fetcher_;
+  std::unique_ptr<net::URLFetcher> url_fetcher_;
 
   // The current OAuth2 token request object.
-  scoped_ptr<OAuth2TokenService::Request> access_token_request_;
+  std::unique_ptr<OAuth2TokenService::Request> access_token_request_;
 
   // The OAuth2 token, or empty if not fetched.
   std::string access_token_;
 
   // True if |request_| has already retried due to a 401 response from the
   // server.
   bool has_retried_authorization_;
 
   base::WeakPtrFactory<PaymentsClient> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PaymentsClient);
 };
 
 }  // namespace payments
 }  // namespace autofill
 
 #endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_PAYMENTS_PAYMENTS_CLIENT_H_