components/autofill: scoped_ptr -> unique_ptr

components/autofill/content/browser/wallet/full_wallet.cc

 // 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.
 
 #include "components/autofill/content/browser/wallet/full_wallet.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/logging.h"
@@ skipping 12 matching lines @@
 
 }  // anonymous namespace
 
 namespace autofill {
 namespace wallet {
 
 FullWallet::FullWallet(int expiration_month,
                        int expiration_year,
                        const std::string& iin,
                        const std::string& encrypted_rest,
-                       scoped_ptr<Address> billing_address,
-                       scoped_ptr<Address> shipping_address)
+                       std::unique_ptr<Address> billing_address,
+                       std::unique_ptr<Address> shipping_address)
     : expiration_month_(expiration_month),
       expiration_year_(expiration_year),
       iin_(iin),
       encrypted_rest_(encrypted_rest),
       billing_address_(std::move(billing_address)),
       shipping_address_(std::move(shipping_address)) {
   DCHECK(billing_address_.get());
 }
 
 FullWallet::~FullWallet() {}
 
 // static
-scoped_ptr<FullWallet>
-    FullWallet::CreateFullWalletFromClearText(
-        int expiration_month,
-        int expiration_year,
-        const std::string& pan,
-        const std::string& cvn,
-        scoped_ptr<Address> billing_address,
-        scoped_ptr<Address> shipping_address) {
+std::unique_ptr<FullWallet> FullWallet::CreateFullWalletFromClearText(
+    int expiration_month,
+    int expiration_year,
+    const std::string& pan,
+    const std::string& cvn,
+    std::unique_ptr<Address> billing_address,
+    std::unique_ptr<Address> shipping_address) {
   DCHECK(billing_address);
   DCHECK(!pan.empty());
   DCHECK(!cvn.empty());
 
-  scoped_ptr<FullWallet> wallet(new FullWallet(
+  std::unique_ptr<FullWallet> wallet(new FullWallet(
       expiration_month, expiration_year,
       std::string(),  // no iin -- clear text pan/cvn are set below.
       std::string(),  // no encrypted_rest -- clear text pan/cvn are set below.
       std::move(billing_address), std::move(shipping_address)));
   wallet->pan_ = pan;
   wallet->cvn_ = cvn;
   return wallet;
 }
 
 base::string16 FullWallet::GetInfo(const std::string& app_locale,
@@ skipping 156 matching lines @@
 }
 
 const std::string& FullWallet::GetCvn() {
   if (cvn_.empty())
     DecryptCardInfo();
   return cvn_;
 }
 
 }  // namespace wallet
 }  // namespace autofill