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

chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestCcCanMakePaymentQueryNoCardTest.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.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 does not have a complete credit card on file.
  */
-@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
         // 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 */));
     }
 
     @MediumTest
     @Feature({"Payments"})
     public void testCannotMakePayment() throws InterruptedException, ExecutionException,
             TimeoutException {
         installPaymentApp(HAVE_INSTRUMENTS, DELAYED_RESPONSE);
         triggerUIAndWait(mCanMakePaymentQueryResponded);
         expectResultContains(new String[]{"false"});
     }
 }