| Index: chrome/browser/extensions/api/autofill_private/autofill_private_api.cc
|
| diff --git a/chrome/browser/extensions/api/autofill_private/autofill_private_api.cc b/chrome/browser/extensions/api/autofill_private/autofill_private_api.cc
|
| index 10ace1ac51e6e8b427b84ae58bb787ec4504f61b..604324fa9e5fd415c155c3947212e20210b0b7e5 100644
|
| --- a/chrome/browser/extensions/api/autofill_private/autofill_private_api.cc
|
| +++ b/chrome/browser/extensions/api/autofill_private/autofill_private_api.cc
|
| @@ -67,63 +67,63 @@ void PopulateAddressComponents(
|
| addressinput::AddressUiComponent::HINT_LONG ||
|
| components[i].length_hint ==
|
| addressinput::AddressUiComponent::HINT_LONG) {
|
| - row = new autofill_private::AddressComponentRow;
|
| - address_components->components.push_back(make_linked_ptr(row));
|
| + address_components->components.push_back(
|
| + autofill_private::AddressComponentRow());
|
| + row = &address_components->components.back();
|
| }
|
|
|
| - scoped_ptr<autofill_private::AddressComponent>
|
| - component(new autofill_private::AddressComponent);
|
| - component->field_name = components[i].name;
|
| + autofill_private::AddressComponent component;
|
| + component.field_name = components[i].name;
|
|
|
| switch (components[i].field) {
|
| case i18n::addressinput::COUNTRY:
|
| - component->field =
|
| + component.field =
|
| autofill_private::AddressField::ADDRESS_FIELD_COUNTRY_CODE;
|
| break;
|
| case i18n::addressinput::ADMIN_AREA:
|
| - component->field =
|
| + component.field =
|
| autofill_private::AddressField::ADDRESS_FIELD_ADDRESS_LEVEL_1;
|
| break;
|
| case i18n::addressinput::LOCALITY:
|
| - component->field =
|
| + component.field =
|
| autofill_private::AddressField::ADDRESS_FIELD_ADDRESS_LEVEL_2;
|
| break;
|
| case i18n::addressinput::DEPENDENT_LOCALITY:
|
| - component->field =
|
| + component.field =
|
| autofill_private::AddressField::ADDRESS_FIELD_ADDRESS_LEVEL_3;
|
| break;
|
| case i18n::addressinput::SORTING_CODE:
|
| - component->field =
|
| + component.field =
|
| autofill_private::AddressField::ADDRESS_FIELD_SORTING_CODE;
|
| break;
|
| case i18n::addressinput::POSTAL_CODE:
|
| - component->field =
|
| + component.field =
|
| autofill_private::AddressField::ADDRESS_FIELD_POSTAL_CODE;
|
| break;
|
| case i18n::addressinput::STREET_ADDRESS:
|
| - component->field =
|
| + component.field =
|
| autofill_private::AddressField::ADDRESS_FIELD_ADDRESS_LINES;
|
| break;
|
| case i18n::addressinput::ORGANIZATION:
|
| - component->field =
|
| + component.field =
|
| autofill_private::AddressField::ADDRESS_FIELD_COMPANY_NAME;
|
| break;
|
| case i18n::addressinput::RECIPIENT:
|
| - component->field =
|
| + component.field =
|
| autofill_private::AddressField::ADDRESS_FIELD_FULL_NAME;
|
| break;
|
| }
|
|
|
| switch (components[i].length_hint) {
|
| case addressinput::AddressUiComponent::HINT_LONG:
|
| - component->is_long_field = true;
|
| + component.is_long_field = true;
|
| break;
|
| case addressinput::AddressUiComponent::HINT_SHORT:
|
| - component->is_long_field = false;
|
| + component.is_long_field = false;
|
| break;
|
| }
|
|
|
| - row->row.push_back(make_linked_ptr(component.release()));
|
| + row->row.push_back(std::move(component));
|
| }
|
| }
|
|
|
|
|