[Payments] Selecting incomplete items will open editors

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 24 matching lines @@
       selected_instrument_(nullptr),
       payment_request_delegate_(payment_request_delegate) {
   PopulateProfileCache();
   SetDefaultProfileSelections();
 }
 PaymentRequestState::~PaymentRequestState() {}
 
 bool PaymentRequestState::CanMakePayment() const {
   for (const std::unique_ptr<PaymentInstrument>& instrument :
        available_instruments_) {
-    if (instrument.get()->IsValid() &&
+    if (instrument->IsValidForCanMakePayment() &&
         spec_->supported_card_networks_set().count(
             instrument.get()->method_name())) {
       return true;
     }
   }
   return false;
 }
 
 void PaymentRequestState::AddObserver(Observer* observer) {
   CHECK(observer);
@@ skipping 127 matching lines @@
       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;
 
-    // TODO(crbug.com/701952): Should use the method name preferred by the
-    // merchant (either "basic-card" or the basic card network e.g. "visa").
-
     // 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));
   }
 }
 
 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];
 
   // TODO(crbug.com/702063): Change this code to prioritize instruments by use
   // count and other means, and implement a way to modify this function's return
   // value.
   const std::vector<std::unique_ptr<PaymentInstrument>>& instruments =
       available_instruments();
   auto first_complete_instrument =
       std::find_if(instruments.begin(), instruments.end(),
                    [](const std::unique_ptr<PaymentInstrument>& instrument) {
-                     return instrument->IsValid();
+                     return instrument->IsCompleteForPayment();
                    });
 
   selected_instrument_ = first_complete_instrument == instruments.end()
                              ? nullptr
                              : first_complete_instrument->get();
 
   UpdateIsReadyToPayAndNotifyObservers();
 }
 
 void PaymentRequestState::UpdateIsReadyToPayAndNotifyObservers() {
   is_ready_to_pay_ =
       ArePaymentDetailsSatisfied() && ArePaymentOptionsSatisfied();
   NotifyOnSelectedInformationChanged();
 }
 
 void PaymentRequestState::NotifyOnSelectedInformationChanged() {
   for (auto& observer : observers_)
     observer.OnSelectedInformationChanged();
 }
 
 bool PaymentRequestState::ArePaymentDetailsSatisfied() {
   // There is no need to check for supported networks, because only supported
   // instruments are listed/created in the flow.
-  // TODO(crbug.com/702063): A masked card may not satisfy IsValid().
-  return selected_instrument_ != nullptr && selected_instrument_->IsValid();
+  return selected_instrument_ != nullptr &&
+         selected_instrument_->IsCompleteForPayment();
 }
 
 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