[Payments] Normalize shipping address change on Desktop

components/payments/content/payment_response_helper.cc

 // Copyright 2017 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/payments/content/payment_response_helper.h"
 
 #include "base/strings/string_split.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/core/browser/autofill_country.h"
 #include "components/autofill/core/browser/autofill_data_util.h"
@@ skipping 50 matching lines @@
   // Start to get the instrument details. Will call back into
   // OnInstrumentDetailsReady.
   selected_instrument_->InvokePaymentApp(this);
 };
 
 PaymentResponseHelper::~PaymentResponseHelper(){};
 
 // static
 mojom::PaymentAddressPtr
 PaymentResponseHelper::GetMojomPaymentAddressFromAutofillProfile(
-    const autofill::AutofillProfile* const profile,
+    const autofill::AutofillProfile& profile,
     const std::string& app_locale) {
   mojom::PaymentAddressPtr payment_address = mojom::PaymentAddress::New();
 
   payment_address->country =
-      base::UTF16ToUTF8(profile->GetRawInfo(autofill::ADDRESS_HOME_COUNTRY));
+      base::UTF16ToUTF8(profile.GetRawInfo(autofill::ADDRESS_HOME_COUNTRY));
   payment_address->address_line = base::SplitString(
-      base::UTF16ToUTF8(profile->GetInfo(
+      base::UTF16ToUTF8(profile.GetInfo(
           autofill::AutofillType(autofill::ADDRESS_HOME_STREET_ADDRESS),
           app_locale)),
       "\n", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
   payment_address->region =
-      base::UTF16ToUTF8(profile->GetRawInfo(autofill::ADDRESS_HOME_STATE));
+      base::UTF16ToUTF8(profile.GetRawInfo(autofill::ADDRESS_HOME_STATE));
   payment_address->city =
-      base::UTF16ToUTF8(profile->GetRawInfo(autofill::ADDRESS_HOME_CITY));
+      base::UTF16ToUTF8(profile.GetRawInfo(autofill::ADDRESS_HOME_CITY));
   payment_address->dependent_locality = base::UTF16ToUTF8(
-      profile->GetRawInfo(autofill::ADDRESS_HOME_DEPENDENT_LOCALITY));
+      profile.GetRawInfo(autofill::ADDRESS_HOME_DEPENDENT_LOCALITY));
   payment_address->postal_code =
-      base::UTF16ToUTF8(profile->GetRawInfo(autofill::ADDRESS_HOME_ZIP));
+      base::UTF16ToUTF8(profile.GetRawInfo(autofill::ADDRESS_HOME_ZIP));
   payment_address->sorting_code = base::UTF16ToUTF8(
-      profile->GetRawInfo(autofill::ADDRESS_HOME_SORTING_CODE));
-  payment_address->language_code = profile->language_code();
+      profile.GetRawInfo(autofill::ADDRESS_HOME_SORTING_CODE));
+  payment_address->language_code = profile.language_code();
   payment_address->organization =
-      base::UTF16ToUTF8(profile->GetRawInfo(autofill::COMPANY_NAME));
-  payment_address->recipient = base::UTF16ToUTF8(profile->GetInfo(
-      autofill::AutofillType(autofill::NAME_FULL), app_locale));
+      base::UTF16ToUTF8(profile.GetRawInfo(autofill::COMPANY_NAME));
+  payment_address->recipient = base::UTF16ToUTF8(
+      profile.GetInfo(autofill::AutofillType(autofill::NAME_FULL), app_locale));
 
   // TODO(crbug.com/705945): Format phone number according to spec.
   payment_address->phone =
-      base::UTF16ToUTF8(profile->GetRawInfo(autofill::PHONE_HOME_WHOLE_NUMBER));
+      base::UTF16ToUTF8(profile.GetRawInfo(autofill::PHONE_HOME_WHOLE_NUMBER));
 
   return payment_address;
 }
 
 void PaymentResponseHelper::OnInstrumentDetailsReady(
     const std::string& method_name,
     const std::string& stringified_details) {
   method_name_ = method_name;
   stringified_details_ = stringified_details;
   is_waiting_for_instrument_details_ = false;
@@ skipping 31 matching lines @@
   // "visa") or through basic-card's supportedNetworks.
   payment_response->method_name =
       spec_->IsMethodSupportedThroughBasicCard(method_name_)
           ? kBasicCardMethodName
           : method_name_;
   payment_response->stringified_details = stringified_details_;
 
   // Shipping Address section
   if (spec_->request_shipping()) {
     payment_response->shipping_address =
-        GetMojomPaymentAddressFromAutofillProfile(&shipping_address_,
+        GetMojomPaymentAddressFromAutofillProfile(shipping_address_,
                                                   app_locale_);
     payment_response->shipping_option = spec_->selected_shipping_option()->id;
   }
 
   // Contact Details section.
   if (spec_->request_payer_name()) {
     DCHECK(selected_contact_profile_);
     payment_response->payer_name =
         base::UTF16ToUTF8(selected_contact_profile_->GetInfo(
             autofill::AutofillType(autofill::NAME_FULL), app_locale_));
@@ skipping 18 matching lines @@
     const std::string default_region_code =
         autofill::AutofillCountry::CountryCodeForLocale(app_locale_);
     payment_response->payer_phone =
         data_util::FormatPhoneForResponse(original_number, default_region_code);
   }
 
   delegate_->OnPaymentResponseReady(std::move(payment_response));
 }
 
 }  // namespace payments