Rename canMakeActivePayment to canMakePayment

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

 // 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.
 
 package org.chromium.chrome.browser.payments;
 
 import android.content.Context;
 import android.os.Handler;
 import android.view.View;
 import android.view.ViewGroup;
@@ skipping 70 matching lines @@
     protected final PaymentsCallbackHelper<CardUnmaskPrompt> mReadyForUnmaskInput;
     protected final PaymentsCallbackHelper<CardUnmaskPrompt> mReadyToUnmask;
     protected final PaymentsCallbackHelper<CardUnmaskPrompt> mUnmaskValidationDone;
     protected final CallbackHelper mReadyToEdit;
     protected final CallbackHelper mEditorValidationError;
     protected final CallbackHelper mEditorTextUpdate;
     protected final CallbackHelper mDismissed;
     protected final CallbackHelper mUnableToAbort;
     protected final CallbackHelper mBillingAddressChangeProcessed;
     protected final CallbackHelper mShowFailed;
-    protected final CallbackHelper mActivePaymentQueryResponded;
+    protected final CallbackHelper mCanMakePaymentQueryResponded;
     protected final CallbackHelper mExpirationMonthChange;
     protected PaymentRequestUI mUI;
 
     private final AtomicReference<ContentViewCore> mViewCoreRef;
     private final AtomicReference<WebContents> mWebContentsRef;
     private final String mTestFilePath;
     private CardUnmaskPrompt mCardUnmaskPrompt;
 
     protected PaymentRequestTestBase(String testFileName) {
         super(ChromeTabbedActivity.class);
         mReadyForInput = new PaymentsCallbackHelper<>();
         mReadyToPay = new PaymentsCallbackHelper<>();
         mSelectionChecked = new PaymentsCallbackHelper<>();
         mResultReady = new PaymentsCallbackHelper<>();
         mReadyForUnmaskInput = new PaymentsCallbackHelper<>();
         mReadyToUnmask = new PaymentsCallbackHelper<>();
         mUnmaskValidationDone = new PaymentsCallbackHelper<>();
         mReadyToEdit = new CallbackHelper();
         mEditorValidationError = new CallbackHelper();
         mEditorTextUpdate = new CallbackHelper();
         mDismissed = new CallbackHelper();
         mUnableToAbort = new CallbackHelper();
         mBillingAddressChangeProcessed = new CallbackHelper();
         mExpirationMonthChange = new CallbackHelper();
         mShowFailed = new CallbackHelper();
-        mActivePaymentQueryResponded = new CallbackHelper();
+        mCanMakePaymentQueryResponded = new CallbackHelper();
         mViewCoreRef = new AtomicReference<>();
         mWebContentsRef = new AtomicReference<>();
         mTestFilePath = UrlUtils.getIsolatedTestFilePath(
                 String.format("chrome/test/data/android/payments/%s", testFileName));
     }
 
     @Override
     public void startMainActivity() throws InterruptedException {}
 
     protected abstract void onMainActivityStarted()
@@ skipping 533 matching lines @@
         mExpirationMonthChange.notifyCalled();
     }
 
     @Override
     public void onPaymentRequestServiceShowFailed() {
         ThreadUtils.assertOnUiThread();
         mShowFailed.notifyCalled();
     }
 
     @Override
-    public void onPaymentRequestServiceActivePaymentQueryResponded() {
+    public void onPaymentRequestServiceCanMakePaymentQueryResponded() {
         ThreadUtils.assertOnUiThread();
-        mActivePaymentQueryResponded.notifyCalled();
+        mCanMakePaymentQueryResponded.notifyCalled();
     }
 
     @Override
     public void onCardUnmaskPromptReadyForInput(CardUnmaskPrompt prompt) {
         ThreadUtils.assertOnUiThread();
         mReadyForUnmaskInput.notifyCalled(prompt);
         mCardUnmaskPrompt = prompt;
     }
 
     @Override
@@ skipping 151 matching lines @@
                 List<PaymentItem> cart, Map<String, PaymentMethodData> methodData,
                 InstrumentDetailsCallback detailsCallback) {
             detailsCallback.onInstrumentDetailsReady(
                     mMethodName, "{\"transaction\": 1337}");
         }
 
         @Override
         public void dismissInstrument() {}
     }
 }