[Merge M-56] Rename canMakeActivePayment to canMakePayment

third_party/WebKit/Source/modules/payments/PaymentRequest.h

Index: third_party/WebKit/Source/modules/payments/PaymentRequest.h
diff --git a/third_party/WebKit/Source/modules/payments/PaymentRequest.h b/third_party/WebKit/Source/modules/payments/PaymentRequest.h
index b97e0e3dc6242fe201ab41f92e0323f0a046419b..7b7f62b3c103555d4063f80e8b75243c77ed4a29 100644
--- a/third_party/WebKit/Source/modules/payments/PaymentRequest.h
+++ b/third_party/WebKit/Source/modules/payments/PaymentRequest.h
@@ -68,7 +68,7 @@ class MODULES_EXPORT PaymentRequest final
   DEFINE_ATTRIBUTE_EVENT_LISTENER(shippingaddresschange);
   DEFINE_ATTRIBUTE_EVENT_LISTENER(shippingoptionchange);
 
-  ScriptPromise canMakeActivePayment(ScriptState*);
+  ScriptPromise canMakePayment(ScriptState*);
 
   // ScriptWrappable:
   bool hasPendingActivity() const override;
@@ -106,8 +106,8 @@ class MODULES_EXPORT PaymentRequest final
   void OnError(payments::mojom::blink::PaymentErrorReason) override;
   void OnComplete() override;
   void OnAbort(bool abortedSuccessfully) override;
-  void OnCanMakeActivePayment(
-      payments::mojom::blink::ActivePaymentQueryResult) override;
+  void OnCanMakePayment(
+      payments::mojom::blink::CanMakePaymentQueryResult) override;
 
   void onCompleteTimeout(TimerBase*);
 
@@ -121,7 +121,7 @@ class MODULES_EXPORT PaymentRequest final
   Member<ScriptPromiseResolver> m_showResolver;
   Member<ScriptPromiseResolver> m_completeResolver;
   Member<ScriptPromiseResolver> m_abortResolver;
-  Member<ScriptPromiseResolver> m_canMakeActivePaymentResolver;
+  Member<ScriptPromiseResolver> m_canMakePaymentResolver;
   payments::mojom::blink::PaymentRequestPtr m_paymentProvider;
   mojo::Binding<payments::mojom::blink::PaymentRequestClient> m_clientBinding;
   Timer<PaymentRequest> m_completeTimer;