[Merge M-56] Rename canMakeActivePayment to canMakePayment

chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestCcCanMakePaymentQueryNoCardTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestCcCanMakePaymentQueryNoCardTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestCcActivePaymentQueryNoCardTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestCcCanMakePaymentQueryNoCardTest.java
similarity index 71%
rename from chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestCcActivePaymentQueryNoCardTest.java
rename to chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestCcCanMakePaymentQueryNoCardTest.java
index b6c355f9c31e3d8d2817f0c297f9489c9b08108d..df4ad8c864526dab620853338c5b8b893d7d2eab 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestCcActivePaymentQueryNoCardTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestCcCanMakePaymentQueryNoCardTest.java
@@ -16,20 +16,20 @@ import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeoutException;
 
 /**
- * A payment integration test for checking whether user can make active payment via a credit card.
+ * A payment integration test for checking whether user can make a payment via a credit card.
  * This user does not have a complete credit card on file.
  */
-@CommandLineFlags.Add("enable-blink-features=CanMakeActivePayment")
-public class PaymentRequestCcActivePaymentQueryNoCardTest extends PaymentRequestTestBase {
-    public PaymentRequestCcActivePaymentQueryNoCardTest() {
-        super("payment_request_active_payment_query_cc_test.html");
+@CommandLineFlags.Add("enable-blink-features=CanMakePayment")
+public class PaymentRequestCcCanMakePaymentQueryNoCardTest extends PaymentRequestTestBase {
+    public PaymentRequestCcCanMakePaymentQueryNoCardTest() {
+        super("payment_request_can_make_payment_query_cc_test.html");
     }
 
     @Override
     public void onMainActivityStarted() throws InterruptedException, ExecutionException,
             TimeoutException {
         // The user has an incomplete credit card on file. This is not sufficient for
-        // canMakeActivePayment() to return true.
+        // canMakePayment() to return true.
         new AutofillTestHelper().setCreditCard(new CreditCard("", "https://example.com", true, true,
                 "Jon Doe", "4111111111111111", "1111", "12", "2050", "visa", R.drawable.pr_visa,
                 "" /* billingAddressId */, "" /* serverId */));
@@ -37,9 +37,10 @@ public class PaymentRequestCcActivePaymentQueryNoCardTest extends PaymentRequest
 
     @MediumTest
     @Feature({"Payments"})
-    public void testCannotMakeActivePayment() throws InterruptedException, ExecutionException,
+    public void testCannotMakePayment() throws InterruptedException, ExecutionException,
             TimeoutException {
-        triggerUIAndWait(mActivePaymentQueryResponded);
+        installPaymentApp(HAVE_INSTRUMENTS, DELAYED_RESPONSE);
+        triggerUIAndWait(mCanMakePaymentQueryResponded);
         expectResultContains(new String[]{"false"});
     }
 }