components/autofill: scoped_ptr -> unique_ptr

components/autofill/core/browser/address_i18n.cc

 // Copyright 2014 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/core/browser/address_i18n.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/logging.h"
 #include "base/strings/string_split.h"
@@ skipping 11 matching lines @@
                              const std::string& app_locale,
                              const AutofillType& type) {
   return profile.GetInfo(type, app_locale);
 }
 
 }  // namespace
 
 using ::i18n::addressinput::AddressData;
 using ::i18n::addressinput::AddressField;
 
-scoped_ptr<AddressData> CreateAddressData(
+std::unique_ptr<AddressData> CreateAddressData(
     const base::Callback<base::string16(const AutofillType&)>& get_info) {
-  scoped_ptr<AddressData> address_data(new AddressData());
+  std::unique_ptr<AddressData> address_data(new AddressData());
   address_data->recipient = base::UTF16ToUTF8(
       get_info.Run(AutofillType(NAME_FULL)));
   address_data->organization = base::UTF16ToUTF8(
       get_info.Run(AutofillType(COMPANY_NAME)));
   address_data->region_code = base::UTF16ToUTF8(
       get_info.Run(AutofillType(HTML_TYPE_COUNTRY_CODE, HTML_MODE_NONE)));
   address_data->administrative_area = base::UTF16ToUTF8(
       get_info.Run(AutofillType(ADDRESS_HOME_STATE)));
   address_data->locality = base::UTF16ToUTF8(
       get_info.Run(AutofillType(ADDRESS_HOME_CITY)));
   address_data->dependent_locality = base::UTF16ToUTF8(
       get_info.Run(AutofillType(ADDRESS_HOME_DEPENDENT_LOCALITY)));
   address_data->sorting_code = base::UTF16ToUTF8(
       get_info.Run(AutofillType(ADDRESS_HOME_SORTING_CODE)));
   address_data->postal_code = base::UTF16ToUTF8(
       get_info.Run(AutofillType(ADDRESS_HOME_ZIP)));
   address_data->address_line = base::SplitString(
       base::UTF16ToUTF8(
           get_info.Run(AutofillType(ADDRESS_HOME_STREET_ADDRESS))),
       "\n", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
   return address_data;
 }
 
-scoped_ptr< ::i18n::addressinput::AddressData>
-    CreateAddressDataFromAutofillProfile(const AutofillProfile& profile,
-                                         const std::string& app_locale) {
-  scoped_ptr< ::i18n::addressinput::AddressData> address_data =
+std::unique_ptr<::i18n::addressinput::AddressData>
+CreateAddressDataFromAutofillProfile(const AutofillProfile& profile,
+                                     const std::string& app_locale) {
+  std::unique_ptr<::i18n::addressinput::AddressData> address_data =
       i18n::CreateAddressData(base::Bind(&GetInfoHelper, profile, app_locale));
   address_data->language_code = profile.language_code();
   return address_data;
 }
 
 ServerFieldType TypeForField(AddressField address_field, bool billing) {
   switch (address_field) {
     case ::i18n::addressinput::COUNTRY:
       return billing ? ADDRESS_BILLING_COUNTRY : ADDRESS_HOME_COUNTRY;
     case ::i18n::addressinput::ADMIN_AREA:
@@ skipping 69 matching lines @@
       if (field)
         *field = ::i18n::addressinput::RECIPIENT;
       return true;
     default:
       return false;
   }
 }
 
 }  // namespace i18n
 }  // namespace autofill