[Payments] Add Ship. Addr. & Contact Info in Payment Response on Desktop.

components/payments/content/payment_request_state.cc

 // Copyright 2016 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_request_state.h"
 
 #include <set>
 
+#include "base/strings/utf_string_conversions.h"
 #include "components/autofill/core/browser/autofill_data_util.h"
 #include "components/autofill/core/browser/autofill_profile.h"
 #include "components/autofill/core/browser/credit_card.h"
 #include "components/autofill/core/browser/personal_data_manager.h"
 #include "components/payments/content/payment_request_spec.h"
+#include "components/payments/content/payment_response_helper.h"
 #include "components/payments/core/autofill_payment_instrument.h"
 
 namespace payments {
 
 PaymentRequestState::PaymentRequestState(
     PaymentRequestSpec* spec,
     Delegate* delegate,
     const std::string& app_locale,
     autofill::PersonalDataManager* personal_data_manager)
     : is_ready_to_pay_(false),
@@ skipping 25 matching lines @@
 void PaymentRequestState::AddObserver(Observer* observer) {
   CHECK(observer);
   observers_.AddObserver(observer);
 }
 PaymentRequestState::~PaymentRequestState() {}
 
 void PaymentRequestState::RemoveObserver(Observer* observer) {
   observers_.RemoveObserver(observer);
 }
 
+// TODO(sebsg): Move this to the PaymentResponseHelper.
 void PaymentRequestState::OnInstrumentDetailsReady(
     const std::string& method_name,
     const std::string& stringified_details) {
-  // TODO(mathp): Fill other fields in the PaymentResponsePtr object.
   mojom::PaymentResponsePtr payment_response = mojom::PaymentResponse::New();
 
   // Make sure that we return the method name that the merchant specified for
   // this instrument: cards can be either specified through their name (e.g.,
   // "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()) {
+    DCHECK(selected_shipping_profile_);
+    payment_response->shipping_address =
+        PaymentResponseHelper::GetMojomPaymentAddressFromAutofillProfile(
+            selected_shipping_profile_, app_locale_);
+
+    DCHECK(selected_shipping_option_);
+    payment_response->shipping_option = 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_));
+  }
+  if (spec_->request_payer_email()) {
+    DCHECK(selected_contact_profile_);
+    payment_response->payer_email = base::UTF16ToUTF8(
+        selected_contact_profile_->GetRawInfo(autofill::EMAIL_ADDRESS));
+  }
+  if (spec_->request_payer_phone()) {
+    DCHECK(selected_contact_profile_);
+    // TODO(crbug.com/705945): Format phone number according to spec.
+    payment_response->payer_phone =
+        base::UTF16ToUTF8(selected_contact_profile_->GetRawInfo(
+            autofill::PHONE_HOME_WHOLE_NUMBER));
+  }
+
   delegate_->OnPaymentResponseAvailable(std::move(payment_response));
 }
 
 void PaymentRequestState::GeneratePaymentResponse() {
   DCHECK(is_ready_to_pay());
   // Fetch the instrument details, will call back into
-  // PaymentRequest::OnInstrumentsDetailsReady.
+  // PaymentRequest::OnInstrumentDetailsReady.
   selected_instrument_->InvokePaymentApp(this);
 }
 
 void PaymentRequestState::SetSelectedShippingOption(
     mojom::PaymentShippingOption* option) {
   selected_shipping_option_ = option;
   UpdateIsReadyToPayAndNotifyObservers();
 }
 
 void PaymentRequestState::SetSelectedShippingProfile(
@@ skipping 148 matching lines @@
       spec_->details().shipping_options.rend(),
       [](const payments::mojom::PaymentShippingOptionPtr& element) {
         return element->selected;
       });
   if (selected_shipping_option_it != spec_->details().shipping_options.rend()) {
     selected_shipping_option_ = selected_shipping_option_it->get();
   }
 }
 
 }  // namespace payments