components/autofill: scoped_ptr -> unique_ptr

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

Index: components/autofill/content/browser/wallet/wallet_test_util.cc
diff --git a/components/autofill/content/browser/wallet/wallet_test_util.cc b/components/autofill/content/browser/wallet/wallet_test_util.cc
index 287dfe70cdffdf048e746a0e1709ccad1dbef8ee..ebef11344a90b489b2d95c8c9f43a31bf21e6718 100644
--- a/components/autofill/content/browser/wallet/wallet_test_util.cc
+++ b/components/autofill/content/browser/wallet/wallet_test_util.cc
@@ -9,6 +9,7 @@
 #include <string>
 #include <vector>
 
+#include "base/memory/ptr_util.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
@@ -38,79 +39,68 @@ std::vector<base::string16> StreetAddress(const std::string& line1,
   return street_address;
 }
 
-scoped_ptr<Address> GetTestAddress() {
-  return make_scoped_ptr(
-      new Address("US",
-                  ASCIIToUTF16("recipient_name"),
-                  StreetAddress("address_line_1", "address_line_2"),
-                  ASCIIToUTF16("locality_name"),
-                  ASCIIToUTF16("dependent_locality_name"),
-                  ASCIIToUTF16("admin_area_name"),
-                  ASCIIToUTF16("postal_code_number"),
-                  ASCIIToUTF16("sorting_code"),
-                  ASCIIToUTF16("phone_number"),
-                  std::string(),
-                  "language_code"));
+std::unique_ptr<Address> GetTestAddress() {
+  return base::WrapUnique(new Address(
+      "US", ASCIIToUTF16("recipient_name"),
+      StreetAddress("address_line_1", "address_line_2"),
+      ASCIIToUTF16("locality_name"), ASCIIToUTF16("dependent_locality_name"),
+      ASCIIToUTF16("admin_area_name"), ASCIIToUTF16("postal_code_number"),
+      ASCIIToUTF16("sorting_code"), ASCIIToUTF16("phone_number"), std::string(),
+      "language_code"));
 }
 
-scoped_ptr<Address> GetTestMinimalAddress() {
-  scoped_ptr<Address> address = GetTestAddress();
+std::unique_ptr<Address> GetTestMinimalAddress() {
+  std::unique_ptr<Address> address = GetTestAddress();
   address->set_is_complete_address(false);
   return address;
 }
 
-scoped_ptr<FullWallet> GetTestFullWallet() {
-  scoped_ptr<FullWallet> wallet(new FullWallet(FutureYear(), 12, "528512",
-                                               "5ec4feecf9d6", GetTestAddress(),
-                                               GetTestShippingAddress()));
+std::unique_ptr<FullWallet> GetTestFullWallet() {
+  std::unique_ptr<FullWallet> wallet(
+      new FullWallet(FutureYear(), 12, "528512", "5ec4feecf9d6",
+                     GetTestAddress(), GetTestShippingAddress()));
   std::vector<uint8_t> one_time_pad;
   base::HexStringToBytes("5F04A8704183", &one_time_pad);
   wallet->set_one_time_pad(one_time_pad);
   return wallet;
 }
 
-scoped_ptr<FullWallet> GetTestFullWalletInstrumentOnly() {
-  scoped_ptr<FullWallet> wallet(new FullWallet(FutureYear(), 12, "528512",
-                                               "5ec4feecf9d6", GetTestAddress(),
-                                               scoped_ptr<Address>()));
+std::unique_ptr<FullWallet> GetTestFullWalletInstrumentOnly() {
+  std::unique_ptr<FullWallet> wallet(
+      new FullWallet(FutureYear(), 12, "528512", "5ec4feecf9d6",
+                     GetTestAddress(), std::unique_ptr<Address>()));
   std::vector<uint8_t> one_time_pad;
   base::HexStringToBytes("5F04A8704183", &one_time_pad);
   wallet->set_one_time_pad(one_time_pad);
   return wallet;
 }
 
-scoped_ptr<Address> GetTestSaveableAddress() {
-  return make_scoped_ptr(
-      new Address("US",
-                  ASCIIToUTF16("save_recipient_name"),
-                  StreetAddress("save_address_line_1", "save_address_line_2"),
-                  ASCIIToUTF16("save_locality_name"),
-                  ASCIIToUTF16("save_dependent_locality_name"),
-                  ASCIIToUTF16("save_admin_area_name"),
-                  ASCIIToUTF16("save_postal_code_number"),
-                  ASCIIToUTF16("save_sorting_code"),
-                  ASCIIToUTF16("save_phone_number"),
-                  std::string(),
-                  "save_language_code"));
+std::unique_ptr<Address> GetTestSaveableAddress() {
+  return base::WrapUnique(new Address(
+      "US", ASCIIToUTF16("save_recipient_name"),
+      StreetAddress("save_address_line_1", "save_address_line_2"),
+      ASCIIToUTF16("save_locality_name"),
+      ASCIIToUTF16("save_dependent_locality_name"),
+      ASCIIToUTF16("save_admin_area_name"),
+      ASCIIToUTF16("save_postal_code_number"),
+      ASCIIToUTF16("save_sorting_code"), ASCIIToUTF16("save_phone_number"),
+      std::string(), "save_language_code"));
 }
 
-scoped_ptr<Address> GetTestShippingAddress() {
-  return make_scoped_ptr(
-      new Address("US",
-                  ASCIIToUTF16("ship_recipient_name"),
-                  StreetAddress("ship_address_line_1", "ship_address_line_2"),
-                  ASCIIToUTF16("ship_locality_name"),
-                  ASCIIToUTF16("ship_dependent_locality_name"),
-                  ASCIIToUTF16("ship_admin_area_name"),
-                  ASCIIToUTF16("ship_postal_code_number"),
-                  ASCIIToUTF16("ship_sorting_code"),
-                  ASCIIToUTF16("ship_phone_number"),
-                  "default_address_id",
-                  "ship_language_code"));
+std::unique_ptr<Address> GetTestShippingAddress() {
+  return base::WrapUnique(new Address(
+      "US", ASCIIToUTF16("ship_recipient_name"),
+      StreetAddress("ship_address_line_1", "ship_address_line_2"),
+      ASCIIToUTF16("ship_locality_name"),
+      ASCIIToUTF16("ship_dependent_locality_name"),
+      ASCIIToUTF16("ship_admin_area_name"),
+      ASCIIToUTF16("ship_postal_code_number"),
+      ASCIIToUTF16("ship_sorting_code"), ASCIIToUTF16("ship_phone_number"),
+      "default_address_id", "ship_language_code"));
 }
 
-scoped_ptr<Address> GetTestNonDefaultShippingAddress() {
-  scoped_ptr<Address> address = GetTestShippingAddress();
+std::unique_ptr<Address> GetTestNonDefaultShippingAddress() {
+  std::unique_ptr<Address> address = GetTestShippingAddress();
   address->set_object_id("address_id");
   return address;
 }