[Payment Request] Update obsolete method name.

PaymentApp::IsValidForCanMakePayment() is only used to compute
hasEnrolledInstrument(). Update this name to HasEnrolledInstrument() to
more accurately reflect the behavior.

Bug: 915907
Change-Id: Ib6281ef0856f1acc6a8d67bbc8ff7b06a69a8684
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2052190
Commit-Queue: Danyao Wang <danyao@chromium.org>
Reviewed-by: Rouslan Solomakhin <rouslan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#740827}

components/payments/content/payment_request_state.cc

@@ -38,14 +38,6 @@
 namespace payments {
 namespace {
 
-// Checks whether any of the |apps| return true in IsValidForCanMakePayment().
-bool GetHasEnrolledInstrument(
-    const std::vector<std::unique_ptr<PaymentApp>>& apps) {
-  return std::any_of(apps.begin(), apps.end(), [](const auto& app) {
-    return app->IsValidForCanMakePayment();
-  });
-}
-
 // Invokes the |callback| with |status|.
 void CallStatusCallback(PaymentRequestState::StatusCallback callback,
                         bool status) {
@@ -174,7 +166,9 @@ void PaymentRequestState::OnDoneCreatingPaymentApps() {
   SetDefaultProfileSelections();
 
   get_all_apps_finished_ = true;
-  has_enrolled_instrument_ = GetHasEnrolledInstrument(available_apps_);
+  has_enrolled_instrument_ =
+      std::any_of(available_apps_.begin(), available_apps_.end(),
+                  [](const auto& app) { return app->HasEnrolledInstrument(); });
   are_requested_methods_supported_ |= !available_apps_.empty();
   NotifyOnGetAllPaymentAppsFinished();
   NotifyInitialized();

components/payments/content/service_worker_payment_app.cc

@@ -394,7 +394,7 @@ base::string16 ServiceWorkerPaymentApp::GetMissingInfoLabel() const {
   return base::string16();
 }
 
-bool ServiceWorkerPaymentApp::IsValidForCanMakePayment() const {
+bool ServiceWorkerPaymentApp::HasEnrolledInstrument() const {
   // This app should not be used when can_make_payment_result_ is false, so this
   // interface should not be invoked.
   DCHECK(can_make_payment_result_);

components/payments/content/service_worker_payment_app.h

@@ -82,7 +82,7 @@ class ServiceWorkerPaymentApp : public PaymentApp {
   uint32_t GetCompletenessScore() const override;
   bool CanPreselect() const override;
   base::string16 GetMissingInfoLabel() const override;
-  bool IsValidForCanMakePayment() const override;
+  bool HasEnrolledInstrument() const override;
   void RecordUse() override;
   bool NeedsInstallation() const override;
   base::string16 GetLabel() const override;

components/payments/content/service_worker_payment_app_unittest.cc

@@ -223,7 +223,7 @@ TEST_F(ServiceWorkerPaymentAppTest, ValidateCanMakePayment) {
   CreateServiceWorkerPaymentApp(/*with_url_method=*/true);
   GetApp()->ValidateCanMakePayment(base::BindOnce(
       [](ServiceWorkerPaymentApp*, bool result) { EXPECT_TRUE(result); }));
-  EXPECT_FALSE(GetApp()->IsValidForCanMakePayment());
+  EXPECT_FALSE(GetApp()->HasEnrolledInstrument());
 }
 
 // Test modifiers can be matched based on capabilities.

components/payments/core/autofill_payment_app.cc

@@ -101,7 +101,7 @@ base::string16 AutofillPaymentApp::GetMissingInfoLabel() const {
       GetCompletionStatusForCard(credit_card_, app_locale_, billing_profiles_));
 }
 
-bool AutofillPaymentApp::IsValidForCanMakePayment() const {
+bool AutofillPaymentApp::HasEnrolledInstrument() const {
   CreditCardCompletionStatus status =
       GetCompletionStatusForCard(credit_card_, app_locale_, billing_profiles_);
   if (PaymentsExperimentalFeatures::IsEnabled(

components/payments/core/autofill_payment_app.h

@@ -43,7 +43,7 @@ class AutofillPaymentApp
   uint32_t GetCompletenessScore() const override;
   bool CanPreselect() const override;
   base::string16 GetMissingInfoLabel() const override;
-  bool IsValidForCanMakePayment() const override;
+  bool HasEnrolledInstrument() const override;
   void RecordUse() override;
   bool NeedsInstallation() const override;
   base::string16 GetLabel() const override;

components/payments/core/autofill_payment_app_unittest.cc

@@ -271,36 +271,36 @@ TEST_F(AutofillPaymentAppTest, IsCompleteForPayment_ExpiredMaskedCard) {
 }
 
 // An expired card is a valid app for canMakePayment.
-TEST_F(AutofillPaymentAppTest, IsValidForCanMakePayment_Minimal) {
+TEST_F(AutofillPaymentAppTest, HasEnrolledInstrument_Minimal) {
   autofill::CreditCard& card = local_credit_card();
   card.SetExpirationYear(2016);  // Expired.
   AutofillPaymentApp app("visa", card, billing_profiles(), "en-US", nullptr);
-  EXPECT_TRUE(app.IsValidForCanMakePayment());
+  EXPECT_TRUE(app.HasEnrolledInstrument());
 }
 
 // An expired Masked (server) card is a valid app for canMakePayment.
-TEST_F(AutofillPaymentAppTest, IsValidForCanMakePayment_MaskedCard) {
+TEST_F(AutofillPaymentAppTest, HasEnrolledInstrument_MaskedCard) {
   autofill::CreditCard card = autofill::test::GetMaskedServerCard();
   card.SetExpirationYear(2016);  // Expired.
   AutofillPaymentApp app("visa", card, billing_profiles(), "en-US", nullptr);
-  EXPECT_TRUE(app.IsValidForCanMakePayment());
+  EXPECT_TRUE(app.HasEnrolledInstrument());
 }
 
 // A card with no name is not a valid app for canMakePayment.
-TEST_F(AutofillPaymentAppTest, IsValidForCanMakePayment_NoName) {
+TEST_F(AutofillPaymentAppTest, HasEnrolledInstrument_NoName) {
   autofill::CreditCard& card = local_credit_card();
   card.SetInfo(autofill::AutofillType(autofill::CREDIT_CARD_NAME_FULL),
                base::ASCIIToUTF16(""), "en-US");
   AutofillPaymentApp app("visa", card, billing_profiles(), "en-US", nullptr);
-  EXPECT_FALSE(app.IsValidForCanMakePayment());
+  EXPECT_FALSE(app.HasEnrolledInstrument());
 }
 
 // A card with no number is not a valid app for canMakePayment.
-TEST_F(AutofillPaymentAppTest, IsValidForCanMakePayment_NoNumber) {
+TEST_F(AutofillPaymentAppTest, HasEnrolledInstrument_NoNumber) {
   autofill::CreditCard& card = local_credit_card();
   card.SetNumber(base::ASCIIToUTF16(""));
   AutofillPaymentApp app("visa", card, billing_profiles(), "en-US", nullptr);
-  EXPECT_FALSE(app.IsValidForCanMakePayment());
+  EXPECT_FALSE(app.HasEnrolledInstrument());
 }
 
 // Tests that the autofill app only calls OnappDetailsReady when

components/payments/core/payment_app.h

@@ -60,10 +60,8 @@ class PaymentApp {
   // Returns a message to indicate to the user what's missing for the app to be
   // complete for payment.
   virtual base::string16 GetMissingInfoLabel() const = 0;
-  // Returns whether the app is valid for the purposes of responding to
-  // canMakePayment.
-  // TODO(crbug.com/915907): rename to IsValidForHasEnrolledInstrument.
-  virtual bool IsValidForCanMakePayment() const = 0;
+  // Returns this app's answer for PaymentRequest.hasEnrolledInstrument().
+  virtual bool HasEnrolledInstrument() const = 0;
   // Records the use of this payment app.
   virtual void RecordUse() = 0;
   // Check whether this payment app needs installation before it can be used.

ios/chrome/browser/payments/ios_payment_instrument.h

@@ -54,7 +54,7 @@ class IOSPaymentInstrument : public PaymentApp {
   uint32_t GetCompletenessScore() const override;
   bool CanPreselect() const override;
   base::string16 GetMissingInfoLabel() const override;
-  bool IsValidForCanMakePayment() const override;
+  bool HasEnrolledInstrument() const override;
   void RecordUse() override;
   bool NeedsInstallation() const override;
   base::string16 GetLabel() const override;

ios/chrome/browser/payments/ios_payment_instrument.mm

@@ -80,7 +80,7 @@ base::string16 IOSPaymentInstrument::GetMissingInfoLabel() const {
   return base::string16();
 }
 
-bool IOSPaymentInstrument::IsValidForCanMakePayment() const {
+bool IOSPaymentInstrument::HasEnrolledInstrument() const {
   // Same as IsCompleteForPayment, as long as the native app is installed
   // and found on the user's device then it is valid for payment.
   return true;

ios/chrome/browser/payments/payment_request.mm

@@ -417,7 +417,7 @@ const PaymentsProfileComparator* PaymentRequest::profile_comparator() const {
 
 bool PaymentRequest::CanMakePayment() const {
   for (PaymentApp* payment_method : payment_methods_) {
-    if (payment_method->IsValidForCanMakePayment()) {
+    if (payment_method->HasEnrolledInstrument()) {
       return true;
     }
   }