[Payments] Use Autofill assets on Android Payment Request

chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestBillingAddressTest.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 static org.chromium.chrome.browser.payments.PaymentRequestTestRule.DECEMBER;
 import static org.chromium.chrome.browser.payments.PaymentRequestTestRule.FIRST_BILLING_ADDRESS;
 import static org.chromium.chrome.browser.payments.PaymentRequestTestRule.NEXT_YEAR;
 
@@ skipping 41 matching lines @@
     private static final int BILLING_ADDRESS_DROPDOWN_INDEX = 2;
 
     @Override
     public void onMainActivityStarted()
             throws InterruptedException, ExecutionException, TimeoutException {
         AutofillTestHelper helper = new AutofillTestHelper();
         String profile1 = helper.setProfile(new AutofillProfile("", "https://example.com", true,
                 "Jon Doe", "Google", "340 Main St", "CA", "Los Angeles", "", "90291", "", "US",
                 "650-253-0000", "jon.doe@gmail.com", "en-US"));
         helper.setCreditCard(new CreditCard("", "https://example.com", true, true, "Jon Doe",
-                "4111111111111111", "1111", "12", "2050", "visa", R.drawable.pr_visa, profile1,
+                "4111111111111111", "1111", "12", "2050", "visa", R.drawable.visa_card, profile1,
                 "" /* serverId */));
         String profile2 = helper.setProfile(new AutofillProfile("", "https://example.com", true,
                 "Rob Doe", "Google", "340 Main St", "CA", "Los Angeles", "", "90291", "", "US",
                 "650-253-0000", "jon.doe@gmail.com", "en-US"));
         String profile3 = helper.setProfile(new AutofillProfile("", "https://example.com", true,
                 "Tom Doe", "Google", "340 Main St", "CA", "Los Angeles", "", "90291", "", "US",
                 "650-253-0000", "jon.doe@gmail.com", "en-US"));
 
         // Incomplete profile (invalid address).
         String profile4 = helper.setProfile(new AutofillProfile("", "https://example.com", true,
@@ skipping 14 matching lines @@
         String profile7 = helper.setProfile(new AutofillProfile("", "https://example.com", true, "",
                 "Google", "340 Main St", "CA", "", "", "90291", "", "US", "", "", "en-US"));
 
         // Profile with empty street address (should not be presented to user).
         String profile8 = helper.setProfile(new AutofillProfile("", "https://example.com", true,
                 "Jerry Doe", "Google", "" /* streetAddress */, "CA", "Los Angeles", "", "90291", "",
                 "US", "650-253-0000", "jerry.doe@gmail.com", "en-US"));
 
         // This card has no billing address selected.
         helper.setCreditCard(new CreditCard("", "https://example.com", true, true, "Jane Doe",
-                "4242424242424242", "1111", "12", "2050", "visa", R.drawable.pr_visa, profile6,
+                "4242424242424242", "1111", "12", "2050", "visa", R.drawable.visa_card, profile6,
                 "" /* serverId */));
 
         // Assign use stats so that incomplete profiles have the highest frecency, profile2 has the
         // highest frecency and profile3 has the lowest among the complete profiles, and profile8
         // has the highest frecency and profile4 has the lowest among the incomplete profiles.
         helper.setProfileUseStatsForTesting(profile1, 5, 5);
         helper.setProfileUseStatsForTesting(profile2, 10, 10);
         helper.setProfileUseStatsForTesting(profile3, 1, 1);
         helper.setProfileUseStatsForTesting(profile4, 15, 15);
         helper.setProfileUseStatsForTesting(profile5, 30, 30);
@@ skipping 388 matching lines @@
         mPaymentRequestTestRule.clickInEditorAndWait(
                 R.id.payments_edit_cancel_button, mPaymentRequestTestRule.getReadyToEdit());
 
         // The previous selected address should be selected after canceling out from edit.
         Assert.assertTrue(
                 mPaymentRequestTestRule
                         .getSpinnerSelectionTextInCardEditor(BILLING_ADDRESS_DROPDOWN_INDEX)
                         .equals("Jon Doe, 340 Main St, Los Angeles, CA 90291"));
     }
 }