[Payments] Desktop: implement shipping address/option change

chrome/browser/ui/views/payments/shipping_option_view_controller.cc

Index: chrome/browser/ui/views/payments/shipping_option_view_controller.cc
diff --git a/chrome/browser/ui/views/payments/shipping_option_view_controller.cc b/chrome/browser/ui/views/payments/shipping_option_view_controller.cc
index e38be790107e70fb544abc6823a63a1b15acba05..4ae31ed4a40a95528d846c0f5c42e9f448a93412 100644
--- a/chrome/browser/ui/views/payments/shipping_option_view_controller.cc
+++ b/chrome/browser/ui/views/payments/shipping_option_view_controller.cc
@@ -16,7 +16,7 @@ namespace {
 
 class ShippingOptionItem : public PaymentRequestItemList::Item {
  public:
-  ShippingOptionItem(payments::mojom::PaymentShippingOption* shipping_option,
+  ShippingOptionItem(mojom::PaymentShippingOption* shipping_option,
                      PaymentRequestSpec* spec,
                      PaymentRequestState* state,
                      PaymentRequestItemList* parent_list,
@@ -37,7 +37,7 @@ class ShippingOptionItem : public PaymentRequestItemList::Item {
 
   void SelectedStateChanged() override {
     if (selected()) {
-      state()->SetSelectedShippingOption(shipping_option_);
+      state()->SetSelectedShippingOption(shipping_option_->id);
       dialog_->GoBack();
     }
   }
@@ -68,7 +68,7 @@ ShippingOptionViewController::ShippingOptionViewController(
   for (const auto& option : spec->details().shipping_options) {
     shipping_option_list_.AddItem(base::MakeUnique<ShippingOptionItem>(
         option.get(), spec, state, &shipping_option_list_, dialog,
-        option.get() == state->selected_shipping_option()));
+        option.get() == spec->selected_shipping_option()));
   }
 }