[Payments] After adding/editing a credit card, instrument is selected.

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"
@@ skipping 98 matching lines @@
   delegate_->OnPaymentResponseAvailable(std::move(payment_response));
 }
 
 void PaymentRequestState::GeneratePaymentResponse() {
   DCHECK(is_ready_to_pay());
   // Fetch the instrument details, will call back into
   // PaymentRequest::OnInstrumentDetailsReady.
   selected_instrument_->InvokePaymentApp(this);
 }
 
+void PaymentRequestState::AddAutofillPaymentInstrument(
+    bool selected,
+    const autofill::CreditCard& card) {
+  std::string basic_card_network =
+      autofill::data_util::GetPaymentRequestData(card.type())
+          .basic_card_payment_type;
+  if (!spec_->supported_card_networks_set().count(basic_card_network))
+    return;
+
+  // AutofillPaymentInstrument makes a copy of |card| so it is effectively
+  // owned by this object.
+  std::unique_ptr<PaymentInstrument> instrument =
+      base::MakeUnique<AutofillPaymentInstrument>(
+          basic_card_network, card, shipping_profiles_, app_locale_,
+          payment_request_delegate_);
+  available_instruments_.push_back(std::move(instrument));
+
+  if (selected)
+    SetSelectedInstrument(available_instruments_.back().get());
+}
+
 void PaymentRequestState::SetSelectedShippingOption(
     const std::string& shipping_option_id) {
   // This will inform the merchant and will lead to them calling updateWith with
   // new PaymentDetails.
   delegate_->OnShippingOptionIdSelected(shipping_option_id);
 }
 
 void PaymentRequestState::SetSelectedShippingProfile(
     autofill::AutofillProfile* profile) {
   selected_shipping_profile_ = profile;
@@ skipping 45 matching lines @@
                  [](const std::unique_ptr<autofill::AutofillProfile>& p) {
                    return p.get();
                  });
 
   contact_profiles_ = profile_util::FilterProfilesForContact(
       raw_profiles_for_filtering, GetApplicationLocale(), *spec_);
 
   // Create the list of available instruments.
   const std::vector<autofill::CreditCard*>& cards =
       personal_data_manager_->GetCreditCardsToSuggest();
-  const std::set<std::string>& supported_card_networks =
-      spec_->supported_card_networks_set();
-  for (autofill::CreditCard* card : cards) {
-    std::string basic_card_network =
-        autofill::data_util::GetPaymentRequestData(card->type())
-            .basic_card_payment_type;
-    if (!supported_card_networks.count(basic_card_network))
-      continue;
-
-    // Copy the credit cards as part of AutofillPaymentInstrument so they are
-    // indirectly owned by this object.
-    std::unique_ptr<PaymentInstrument> instrument =
-        base::MakeUnique<AutofillPaymentInstrument>(
-            basic_card_network, *card, shipping_profiles_, app_locale_,
-            payment_request_delegate_);
-    available_instruments_.push_back(std::move(instrument));
-  }
+  for (autofill::CreditCard* card : cards)
+    AddAutofillPaymentInstrument(/*selected=*/false, *card);
 }
 
 void PaymentRequestState::SetDefaultProfileSelections() {
   // Only pre-select an address if the merchant provided at least one selected
   // shipping option.
   if (!shipping_profiles().empty() && spec_->selected_shipping_option())
     selected_shipping_profile_ = shipping_profiles()[0];
 
   if (!contact_profiles().empty())
     selected_contact_profile_ = contact_profiles()[0];
@@ skipping 37 matching lines @@
 bool PaymentRequestState::ArePaymentOptionsSatisfied() {
   // TODO(mathp): Have a measure of shipping address completeness.
   if (spec_->request_shipping() && selected_shipping_profile_ == nullptr)
     return false;
 
   profile_util::PaymentsProfileComparator comparator(app_locale_, *spec_);
   return comparator.IsContactInfoComplete(selected_contact_profile_);
 }
 
 }  // namespace payments