[Merge M-56] Rename canMakeActivePayment to canMakePayment

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

 // 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.
 
 #ifndef PaymentRequest_h
 #define PaymentRequest_h
 
 #include "bindings/core/v8/ScriptPromise.h"
 #include "bindings/core/v8/ScriptValue.h"
 #include "bindings/core/v8/ScriptWrappable.h"
@@ skipping 50 matching lines @@
   ScriptPromise show(ScriptState*);
   ScriptPromise abort(ScriptState*);
 
   PaymentAddress* getShippingAddress() const { return m_shippingAddress.get(); }
   const String& shippingOption() const { return m_shippingOption; }
   const String& shippingType() const { return m_shippingType; }
 
   DEFINE_ATTRIBUTE_EVENT_LISTENER(shippingaddresschange);
   DEFINE_ATTRIBUTE_EVENT_LISTENER(shippingoptionchange);
 
-  ScriptPromise canMakeActivePayment(ScriptState*);
+  ScriptPromise canMakePayment(ScriptState*);
 
   // ScriptWrappable:
   bool hasPendingActivity() const override;
 
   // EventTargetWithInlineData:
   const AtomicString& interfaceName() const override;
   ExecutionContext* getExecutionContext() const override;
 
   // PaymentCompleter:
   ScriptPromise complete(ScriptState*, PaymentComplete result) override;
@@ skipping 17 matching lines @@
   void contextDestroyed() override;
 
   // payments::mojom::blink::PaymentRequestClient:
   void OnShippingAddressChange(
       payments::mojom::blink::PaymentAddressPtr) override;
   void OnShippingOptionChange(const String& shippingOptionId) override;
   void OnPaymentResponse(payments::mojom::blink::PaymentResponsePtr) override;
   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*);
 
   // Clears the promise resolvers and closes the Mojo connection.
   void clearResolversAndCloseMojoConnection();
 
   PaymentOptions m_options;
   Member<PaymentAddress> m_shippingAddress;
   String m_shippingOption;
   String m_shippingType;
   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;
 };
 
 }  // namespace blink
 
 #endif  // PaymentRequest_h