[Merge M-56] Enable canMakePayment() for web payments.

chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestCcCanMakePaymentQueryTest.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.test.suitebuilder.annotation.MediumTest;
 
-import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.base.test.util.Feature;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.autofill.AutofillTestHelper;
 import org.chromium.chrome.browser.autofill.PersonalDataManager.AutofillProfile;
 import org.chromium.chrome.browser.autofill.PersonalDataManager.CreditCard;
 
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeoutException;
 
 /**
  * A payment integration test for checking whether user can make a payment via a credit card.
  * This user has a complete credit card on file.
  */
-@CommandLineFlags.Add("enable-blink-features=CanMakePayment")
 public class PaymentRequestCcCanMakePaymentQueryTest extends PaymentRequestTestBase {
     public PaymentRequestCcCanMakePaymentQueryTest() {
         super("payment_request_can_make_payment_query_cc_test.html");
     }
 
     @Override
     public void onMainActivityStarted() throws InterruptedException, ExecutionException,
             TimeoutException {
         // The user has a complete credit card on file. This is sufficient for
         // canMakePayment() to return true.
@@ skipping 22 matching lines @@
 
         // Different queries are throttled for a period of time.
         clickNodeAndWait("other-buy", mCanMakePaymentQueryResponded);
         expectResultContains(new String[]{"Query quota exceeded"});
 
         // Repeating the same query again does not count against the quota.
         clickNodeAndWait("buy", mCanMakePaymentQueryResponded);
         expectResultContains(new String[]{"true"});
     }
 }