[Mfill Android] Replace credit card icons with borderless version

This CL replaces only the credit card icons for Android with versions
without gray borderline. Only the credit card settings are immediately
affected — all other instances seem to use images from the native side.

The larger goal is to have nicer icons in autofill chips and fallback
sheets in the keyboard accessory.

Bug: 985318
Change-Id: I4c140233f13ce68acc3b72af105f16b73233f421
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1730916
Commit-Queue: Friedrich [CET] <fhorschig@chromium.org>
Reviewed-by: David Trainor <dtrainor@chromium.org>
Reviewed-by: Vasilii Sukhanov <vasilii@chromium.org>
Cr-Commit-Position: refs/heads/master@{#689964}

chrome/android/features/autofill_assistant/javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantPaymentRequestTestHelper.java

@@ -201,7 +201,7 @@ public class AutofillAssistantPaymentRequestTestHelper {
 
         PersonalDataManager.CreditCard creditCard = new PersonalDataManager.CreditCard("",
                 "https://example.com", true, true, profileName, "4111111111111111", "1111", "12",
-                "2050", "visa", org.chromium.chrome.autofill_assistant.R.drawable.visa_card,
+                "2050", "amex", org.chromium.chrome.autofill_assistant.R.drawable.amex_card,
                 CardType.UNKNOWN, billingAddressId, "" /* serverId */);
         return setCreditCard(creditCard);
     }

chrome/android/features/autofill_assistant/javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantPaymentRequestUiTest.java

@@ -394,7 +394,7 @@ public class AutofillAssistantPaymentRequestUiTest {
         String billingAddressId = mHelper.setProfile(profile);
         PersonalDataManager.CreditCard creditCard =
                 new PersonalDataManager.CreditCard("", "https://example.com", true, true, "Jon Doe",
-                        "4111111111111111", "1111", "12", "2050", "visa", R.drawable.visa_card,
+                        "4111111111111111", "1111", "12", "2050", "amex", R.drawable.amex_card,
                         CardType.UNKNOWN, billingAddressId, "" /* serverId */);
         mHelper.setCreditCard(creditCard);
 

chrome/android/java/res/drawable/discover_card.xml

 <?xml version="1.0" encoding="utf-8"?>
-<!-- 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. -->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:targetApi="21"
-    android:width="32dp"
-    android:height="20dp"
-    android:viewportWidth="128"
-    android:viewportHeight="80">
-
-    <path
-        android:pathData="M0,8C0,3.58 3.59,0 8.01,0L119.99,0C124.42,0 128,3.58 128,8L128,72C128,76.42 124.41,80 119.99,80L8.01,80C3.58,80 0,76.42 0,72L0,8Z"
-        android:strokeColor="#00000000"
-        android:fillColor="#E0E0E0"
-        android:strokeWidth="1"/>
-    <path
-        android:pathData="M4,8L4,72C4,74.21 5.79,76 8.01,76L119.99,76C122.2,76 124,74.21 124,72L124,8C124,5.79 122.21,4 119.99,4L8.01,4C5.8,4 4,5.79 4,8Z"
-        android:strokeColor="#00000000"
-        android:fillColor="#FFFFFF"
-        android:strokeWidth="1"/>
-    <path
-        android:pathData="M4,8L4,72C4,74.21 5.79,76 8.01,76L119.99,76C122.2,76 124,74.21 124,72L124,8C124,5.79 122.21,4 119.99,4L8.01,4C5.8,4 4,5.79 4,8Z"
-        android:strokeColor="#00000000"
-        android:fillColor="#FFFFFF"
-        android:strokeWidth="1"/>
-    <path
-        android:pathData="M36,76L119.99,76C122.2,76 124,74.21 124,72L124,46C124,46 90.89,67.1 36,76Z"
-        android:strokeColor="#00000000"
-        android:fillColor="#F68221"
-        android:strokeWidth="1"/>
-    <path
-        android:pathData="M16.8,28L12.06,28L12.06,44L16.78,44C19.29,44 21.11,43.43 22.7,42.15C24.59,40.64 25.71,38.36 25.71,36.01C25.71,31.29 22.05,28 16.8,28L16.8,28ZM20.58,40.02C19.57,40.9 18.25,41.29 16.16,41.29L15.29,41.29L15.29,30.71L16.16,30.71C18.25,30.71 19.51,31.07 20.58,32C21.7,32.96 22.37,34.45 22.37,35.99C22.38,37.52 21.7,39.06 20.58,40.02L20.58,40.02Z"
-        android:strokeColor="#00000000"
-        android:fillColor="#231F20"
-        android:strokeWidth="1"/>
-    <path
-        android:pathData="M27.2,28h3.24v16h-3.24z"
-        android:strokeColor="#00000000"
-        android:fillColor="#231F20"
-        android:strokeWidth="1"/>
-    <path
-        android:pathData="M38.34,34.16C36.4,33.47 35.83,33.01 35.83,32.14C35.83,31.13 36.85,30.36 38.24,30.36C39.21,30.36 40.01,30.74 40.85,31.66L42.54,29.52C41.15,28.34 39.49,27.73 37.67,27.73C34.74,27.73 32.5,29.71 32.5,32.34C32.5,34.55 33.54,35.68 36.58,36.74C37.84,37.17 38.49,37.46 38.81,37.65C39.46,38.06 39.78,38.64 39.78,39.32C39.78,40.62 38.71,41.58 37.27,41.58C35.73,41.58 34.48,40.84 33.74,39.44L31.65,41.39C33.14,43.51 34.93,44.45 37.39,44.45C40.75,44.45 43.11,42.28 43.11,39.17C43.11,36.62 42.02,35.47 38.34,34.16L38.34,34.16Z"
-        android:strokeColor="#00000000"
-        android:fillColor="#231F20"
-        android:strokeWidth="1"/>
-    <path
-        android:pathData="M44.13,36.04C44.13,40.76 47.96,44.42 52.89,44.42C54.28,44.42 55.47,44.15 56.94,43.49L56.94,39.8C55.65,41.05 54.5,41.56 53.04,41.56C49.78,41.56 47.47,39.27 47.47,36.02C47.47,32.93 49.85,30.5 52.89,30.5C54.43,30.5 55.6,31.03 56.94,32.31L56.94,28.62C55.52,27.92 54.35,27.64 52.96,27.64C48.06,27.64 44.13,31.37 44.13,36.04L44.13,36.04Z"
-        android:strokeColor="#00000000"
-        android:fillColor="#231F20"
-        android:strokeWidth="1"/>
-    <path
-        android:pathData="M82.59,38.79l-4.42,-10.79l-3.53,0l7.04,16.48l1.74,0l7.17,-16.48l-3.51,0z"
-        android:strokeColor="#00000000"
-        android:fillColor="#231F20"
-        android:strokeWidth="1"/>
-    <path
-        android:pathData="M57.72,36.04a8.99,8.72 0,1 0,17.98 0a8.99,8.72 0,1 0,-17.98 0z"
-        android:strokeColor="#00000000"
-        android:fillColor="#F68221"
-        android:strokeWidth="1"/>
-    <path
-        android:pathData="M92.04,44l9.18,0l0,-2.71l-5.94,0l0,-4.32l5.72,0l0,-2.71l-5.72,0l0,-3.55l5.94,0l0,-2.71l-9.18,0z"
-        android:strokeColor="#00000000"
-        android:fillColor="#231F20"
-        android:strokeWidth="1"/>
-    <path
-        android:pathData="M114.02,32.72C114.02,29.73 111.89,28 108.16,28L103.36,28L103.36,44L106.59,44L106.59,37.57L107.01,37.57L111.49,44L115.46,44L110.24,37.26C112.68,36.78 114.02,35.17 114.02,32.72L114.02,32.72ZM107.53,35.36L106.59,35.36L106.59,30.52L107.59,30.52C109.6,30.52 110.7,31.33 110.7,32.89C110.69,34.5 109.6,35.36 107.53,35.36L107.53,35.36Z"
-        android:strokeColor="#00000000"
-        android:fillColor="#231F20"
-        android:strokeWidth="1"/>
+<!--Copyright 2019 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.-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" xmlns:aapt="http://schemas.android.com/aapt" tools:targetApi="21" android:width="32dp" android:height="20dp" android:viewportWidth="32" android:viewportHeight="20">
+    <path android:pathData="M9 20h21c1.104 0 2-0.894 2-1.993V11.5S23.346 17.478 9 20z" android:strokeWidth="1" android:fillColor="#F68221" android:fillType="evenOdd"/>
+    <path android:pathData="M4.201 7H3.014v4h1.18c0.629 0 1.083-0.144 1.48-0.463 0.473-0.377 0.753-0.947 0.753-1.535C6.427 7.822 5.513 7 4.2 7zm0.945 3.004c-0.255 0.222-0.585 0.318-1.107 0.318H3.822V7.677H4.04c0.522 0 0.84 0.09 1.107 0.324 0.28 0.24 0.447 0.612 0.447 0.995 0.001 0.384-0.167 0.768-0.447 1.008zM6.799 7h0.809v4h-0.81zm2.787 1.54C9.1 8.366 8.958 8.252 8.958 8.035c0-0.253 0.253-0.445 0.602-0.445 0.242 0 0.442 0.096 0.653 0.325l0.423-0.536c-0.348-0.295-0.764-0.446-1.218-0.446-0.734 0-1.294 0.494-1.294 1.15 0 0.554 0.26 0.838 1.02 1.102 0.316 0.108 0.477 0.18 0.56 0.228 0.16 0.102 0.24 0.247 0.24 0.417 0 0.325-0.267 0.567-0.627 0.567-0.386 0-0.697-0.187-0.883-0.536l-0.522 0.488c0.373 0.53 0.82 0.764 1.435 0.764 0.84 0 1.43-0.54 1.43-1.319 0-0.638-0.273-0.926-1.192-1.253zm1.447 0.47c0 1.18 0.957 2.095 2.189 2.095 0.348 0 0.646-0.066 1.013-0.234V9.95c-0.323 0.313-0.61 0.44-0.976 0.44-0.814 0-1.393-0.573-1.393-1.386 0-0.77 0.597-1.379 1.356-1.379 0.385 0 0.677 0.133 1.013 0.452V7.155C13.88 6.981 13.588 6.91 13.241 6.91c-1.226 0-2.208 0.934-2.208 2.101zm9.615 0.688l-1.106-2.699h-0.883l1.76 4.12h0.435L22.644 7h-0.876z" android:strokeWidth="1" android:fillColor="#231F20" android:fillType="evenOdd"/>
+    <path android:pathData="M14.431 9.01a2.248 2.18 0 1 0 4.496 0 2.248 2.18 0 1 0-4.496 0z" android:strokeWidth="1" android:fillType="evenOdd">
+        <aapt:attr name="android:fillColor">
+            <gradient android:startY="7.4145775" android:startX="15.346851" android:endY="10.565744" android:endX="18.06089" android:type="linear">
+                <item android:offset="0" android:color="#FFE54B1A"/>
+                <item android:offset="1" android:color="#FFFBA025"/>
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path android:pathData="M14.431 9.01a2.248 2.18 0 1 0 4.496 0 2.248 2.18 0 1 0-4.496 0z" android:strokeWidth="1" android:fillColor="#000000" android:fillType="evenOdd"/>
+    <path android:pathData="M23.01 11h2.294v-0.678h-1.486v-1.08h1.43V8.566h-1.43V7.677h1.486V7H23.01zm5.496-2.82c0-0.748-0.535-1.18-1.467-1.18h-1.2v4h0.808V9.393h0.105L27.872 11h0.994l-1.305-1.685c0.61-0.12 0.945-0.522 0.945-1.134zm-1.622 0.66h-0.236V7.63h0.249c0.503 0 0.777 0.203 0.777 0.592 0 0.402-0.274 0.619-0.79 0.619z" android:strokeWidth="1" android:fillColor="#231F20" android:fillType="evenOdd"/>
+    <path android:pathData="M9 20h21c1.104 0 2-0.894 2-1.993V11.5S23.346 17.478 9 20z" android:strokeWidth="1" android:fillColor="#F68221" android:fillType="evenOdd"/>
+    <path android:pathData="M4.201 7H3.014v4h1.18c0.629 0 1.083-0.144 1.48-0.463 0.473-0.377 0.753-0.947 0.753-1.535C6.427 7.822 5.513 7 4.2 7zm0.945 3.004c-0.255 0.222-0.585 0.318-1.107 0.318H3.822V7.677H4.04c0.522 0 0.84 0.09 1.107 0.324 0.28 0.24 0.447 0.612 0.447 0.995 0.001 0.384-0.167 0.768-0.447 1.008zM6.799 7h0.809v4h-0.81zm2.787 1.54C9.1 8.366 8.958 8.252 8.958 8.035c0-0.253 0.253-0.445 0.602-0.445 0.242 0 0.442 0.096 0.653 0.325l0.423-0.536c-0.348-0.295-0.764-0.446-1.218-0.446-0.734 0-1.294 0.494-1.294 1.15 0 0.554 0.26 0.838 1.02 1.102 0.316 0.108 0.477 0.18 0.56 0.228 0.16 0.102 0.24 0.247 0.24 0.417 0 0.325-0.267 0.567-0.627 0.567-0.386 0-0.697-0.187-0.883-0.536l-0.522 0.488c0.373 0.53 0.82 0.764 1.435 0.764 0.84 0 1.43-0.54 1.43-1.319 0-0.638-0.273-0.926-1.192-1.253zm1.447 0.47c0 1.18 0.957 2.095 2.189 2.095 0.348 0 0.646-0.066 1.013-0.234V9.95c-0.323 0.313-0.61 0.44-0.976 0.44-0.814 0-1.393-0.573-1.393-1.386 0-0.77 0.597-1.379 1.356-1.379 0.385 0 0.677 0.133 1.013 0.452V7.155C13.88 6.981 13.588 6.91 13.241 6.91c-1.226 0-2.208 0.934-2.208 2.101zm9.615 0.688l-1.106-2.699h-0.883l1.76 4.12h0.435L22.644 7h-0.876z" android:strokeWidth="1" android:fillColor="#231F20" android:fillType="evenOdd"/>
+    <path android:pathData="M14.431 9.01a2.248 2.18 0 1 0 4.496 0 2.248 2.18 0 1 0-4.496 0z" android:strokeWidth="1" android:fillType="evenOdd">
+        <aapt:attr name="android:fillColor">
+            <gradient android:startY="7.4145775" android:startX="15.346851" android:endY="10.565744" android:endX="18.06089" android:type="linear">
+                <item android:offset="0" android:color="#FFE54B1A"/>
+                <item android:offset="1" android:color="#FFFBA025"/>
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path android:pathData="M14.431 9.01a2.248 2.18 0 1 0 4.496 0 2.248 2.18 0 1 0-4.496 0z" android:strokeWidth="1" android:fillColor="#000000" android:fillType="evenOdd"/>
+    <path android:pathData="M23.01 11h2.294v-0.678h-1.486v-1.08h1.43V8.566h-1.43V7.677h1.486V7H23.01zm5.496-2.82c0-0.748-0.535-1.18-1.467-1.18h-1.2v4h0.808V9.393h0.105L27.872 11h0.994l-1.305-1.685c0.61-0.12 0.945-0.522 0.945-1.134zm-1.622 0.66h-0.236V7.63h0.249c0.503 0 0.777 0.203 0.777 0.592 0 0.402-0.274 0.619-0.79 0.619z" android:strokeWidth="1" android:fillColor="#231F20" android:fillType="evenOdd"/>
 </vector>
-

chrome/android/java/res/drawable/elo_card.xml

 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2017 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. -->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-   xmlns:tools="http://schemas.android.com/tools"
-   tools:targetApi="21"
-   android:width="32dp"
-   android:height="20dp"
-   android:viewportWidth="128"
-   android:viewportHeight="80">
-
-    <path
-        android:pathData="M0,8C0,3.58 3.59,0 8.01,0L119.99,0C124.42,0 128,3.58 128,8L128,72C128,76.42 124.41,80 119.99,80L8.01,80C3.58,80 0,76.42 0,72L0,8Z"
-        android:strokeColor="#00000000"
-        android:fillColor="#E0E0E0"
-        android:strokeWidth="1"/>
-    <path
-        android:pathData="M4,8L4,72C4,74.21 5.79,76 8.01,76L119.99,76C122.2,76 124,74.21 124,72L124,8C124,5.79 122.21,4 119.99,4L8.01,4C5.8,4 4,5.79 4,8Z"
-        android:strokeColor="#00000000"
-        android:fillColor="#FFFFFF"
-        android:strokeWidth="1"/>
-    <path
-        android:pathData="M36,40C36,24.53 48.53,12 64,12C79.47,12 92,24.53 92,40C92,55.47 79.47,68 64,68C48.53,68 36,55.47 36,40"
-        android:strokeColor="#00000000"
-        android:fillColor="#000000"
-        android:strokeWidth="1"/>
-    <path
-        android:pathData="M55.48,43.4C54.61,44.25 53.44,44.77 52.13,44.75C51.24,44.73 50.41,44.47 49.71,44.02L47.97,46.8C49.16,47.55 50.57,48 52.09,48.02C54.3,48.06 56.31,47.19 57.77,45.75L55.48,43.4Z"
-        android:strokeColor="#00000000"
-        android:fillColor="#FFFFFF"
-        android:strokeWidth="1"/>
-    <path
-        android:pathData="M47.54,40.55C47.52,40.36 47.51,40.17 47.52,39.98C47.56,37.39 49.69,35.32 52.28,35.36C53.69,35.38 54.94,36.03 55.79,37.03L47.54,40.55ZM52.33,32.08C47.93,32.02 44.31,35.53 44.24,39.93C44.22,41.58 44.69,43.12 45.53,44.4L59.96,38.23C59.15,34.76 56.06,32.14 52.33,32.08L52.33,32.08Z"
-        android:strokeColor="#00000000"
-        android:fillColor="#FFFFFF"
-        android:strokeWidth="1"/>
-    <path
-        android:pathData="M64.49,28.49L64.49,43.88L67.16,44.99L65.9,48.02L63.26,46.92C62.66,46.67 62.26,46.28 61.96,45.83C61.66,45.38 61.45,44.76 61.45,43.92L61.45,28.49L64.49,28.49Z"
-        android:strokeColor="#00000000"
-        android:fillColor="#FFFFFF"
-        android:strokeWidth="1"/>
-    <path 
-        android:pathData="M72.51,43.59L72.51,43.59C71.61,42.73 70.9,41.39 70.9,40.05C70.9,38.65 71.53,37.4 72.51,36.55C72.5,36.55 70.32,34.09 70.32,34.09C68.67,35.55 67.62,37.68 67.62,40.05C67.62,42.46 68.7,44.62 70.38,46.08L72.51,43.59"
-        android:strokeColor="#00000000"
-        android:fillColor="#00A6E0"
-        android:strokeWidth="1"/>
-    <path
-        android:pathData="M74.03,35.64C74.54,35.45 75.02,35.36 75.59,35.36C77.86,35.36 79.74,36.97 80.19,39.1L83.4,38.43C82.65,34.81 79.44,32.08 75.59,32.08C74.66,32.08 73.77,32.25 72.94,32.54L74.03,35.64C74.03,35.64 74.05,35.63 74.03,35.64"
-        android:strokeColor="#00000000"
-        android:fillColor="#FFF000"
-        android:strokeWidth="1"/>
-    <path
-        android:pathData="M75.59,44.74C74.96,44.74 74.06,44.48 74.06,44.48L73.02,47.59C73.83,47.87 74.69,48.02 75.59,48.02C79.48,48.02 82.72,45.24 83.42,41.55L80.19,40.94C79.78,43.11 77.88,44.74 75.59,44.74"
-        android:strokeColor="#00000000"
-        android:fillColor="#FF0217"
-        android:strokeWidth="1"/>
-</vector>
+<!--Copyright 2019 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.-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" tools:targetApi="21" android:width="32dp" android:height="20dp" android:viewportWidth="32" android:viewportHeight="20">
+    <path android:pathData="M9 10c0-3.867 3.134-7 7-7s7 3.133 7 7-3.134 7-7 7-7-3.133-7-7" android:strokeWidth="1" android:fillColor="#000000" android:fillType="evenOdd"/>
+    <path android:pathData="M13.87 10.85c-0.216 0.213-0.511 0.341-0.836 0.337-0.224-0.004-0.43-0.07-0.606-0.182l-0.436 0.694c0.298 0.189 0.65 0.3 1.03 0.307 0.552 0.008 1.055-0.21 1.421-0.568l-0.572-0.587zm-1.984-0.713c-0.005-0.046-0.008-0.094-0.007-0.142 0.01-0.648 0.544-1.165 1.191-1.154 0.353 0.005 0.666 0.166 0.877 0.416l-2.061 0.88zm1.196-2.116c-1.1-0.017-2.005 0.862-2.021 1.962-0.007 0.412 0.112 0.797 0.322 1.118l3.608-1.543c-0.203-0.869-0.976-1.522-1.91-1.537zm3.04-0.898v3.847l0.668 0.277-0.316 0.758-0.66-0.274c-0.148-0.064-0.249-0.162-0.325-0.273-0.073-0.113-0.128-0.268-0.128-0.477V7.123h0.761z" android:strokeWidth="1" android:fillColor="#FFFFFF" android:fillType="evenOdd"/>
+    <path android:pathData="M18.128 10.897c-0.225-0.214-0.402-0.55-0.402-0.883 0-0.351 0.157-0.663 0.4-0.878L17.58 8.522c-0.412 0.365-0.673 0.897-0.673 1.492 0 0.602 0.268 1.14 0.69 1.506l0.532-0.623" android:strokeWidth="1" android:fillColor="#00A6E0" android:fillType="evenOdd"/>
+    <path android:pathData="M18.508 8.91c0.127-0.047 0.246-0.07 0.39-0.07 0.567 0 1.038 0.401 1.149 0.934l0.802-0.167c-0.187-0.905-0.989-1.586-1.951-1.586-0.232 0-0.455 0.041-0.663 0.115l0.273 0.774s0.005-0.002 0 0" android:strokeWidth="1" android:fillColor="#FFF000" android:fillType="evenOdd"/>
+    <path android:pathData="M18.898 11.186c-0.157 0-0.382-0.067-0.382-0.067l-0.262 0.778c0.202 0.07 0.419 0.109 0.644 0.109 0.973 0 1.782-0.697 1.957-1.619l-0.806-0.152c-0.104 0.542-0.579 0.951-1.151 0.951" android:strokeWidth="1" android:fillColor="#FF0217" android:fillType="evenOdd"/>
+    <path android:pathData="M9 10c0-3.867 3.134-7 7-7s7 3.133 7 7-3.134 7-7 7-7-3.133-7-7" android:strokeWidth="1" android:fillColor="#000000" android:fillType="evenOdd"/>
+    <path android:pathData="M13.87 10.85c-0.216 0.213-0.511 0.341-0.836 0.337-0.224-0.004-0.43-0.07-0.606-0.182l-0.436 0.694c0.298 0.189 0.65 0.3 1.03 0.307 0.552 0.008 1.055-0.21 1.421-0.568l-0.572-0.587zm-1.984-0.713c-0.005-0.046-0.008-0.094-0.007-0.142 0.01-0.648 0.544-1.165 1.191-1.154 0.353 0.005 0.666 0.166 0.877 0.416l-2.061 0.88zm1.196-2.116c-1.1-0.017-2.005 0.862-2.021 1.962-0.007 0.412 0.112 0.797 0.322 1.118l3.608-1.543c-0.203-0.869-0.976-1.522-1.91-1.537zm3.04-0.898v3.847l0.668 0.277-0.316 0.758-0.66-0.274c-0.148-0.064-0.249-0.162-0.325-0.273-0.073-0.113-0.128-0.268-0.128-0.477V7.123h0.761z" android:strokeWidth="1" android:fillColor="#FFFFFF" android:fillType="evenOdd"/>
+    <path android:pathData="M18.128 10.897c-0.225-0.214-0.402-0.55-0.402-0.883 0-0.351 0.157-0.663 0.4-0.878L17.58 8.522c-0.412 0.365-0.673 0.897-0.673 1.492 0 0.602 0.268 1.14 0.69 1.506l0.532-0.623" android:strokeWidth="1" android:fillColor="#00A6E0" android:fillType="evenOdd"/>
+    <path android:pathData="M18.508 8.91c0.127-0.047 0.246-0.07 0.39-0.07 0.567 0 1.038 0.401 1.149 0.934l0.802-0.167c-0.187-0.905-0.989-1.586-1.951-1.586-0.232 0-0.455 0.041-0.663 0.115l0.273 0.774s0.005-0.002 0 0" android:strokeWidth="1" android:fillColor="#FFF000" android:fillType="evenOdd"/>
+    <path android:pathData="M18.898 11.186c-0.157 0-0.382-0.067-0.382-0.067l-0.262 0.778c0.202 0.07 0.419 0.109 0.644 0.109 0.973 0 1.782-0.697 1.957-1.619l-0.806-0.152c-0.104 0.542-0.579 0.951-1.151 0.951" android:strokeWidth="1" android:fillColor="#FF0217" android:fillType="evenOdd"/>
+</vector>
\ No newline at end of file

chrome/android/java/res/drawable/mc_card.xml

-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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. -->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:targetApi="21"
-    android:width="32dp"
-    android:height="20dp"
-    android:viewportWidth="128"
-    android:viewportHeight="80">
-
-    <path
-        android:fillColor="#E0E0E0"
-        android:fillType="evenOdd"
-        android:strokeWidth="1"
-        android:pathData="M0,8.00005106 C0,3.58174486 3.59075293,0 8.00697327,0 L119.993027,0
-C124.415156,0 128,3.5797863 128,8.00005106 L128,71.9999489 C128,76.4182551
-124.409247,80 119.993027,80 L8.00697327,80 C3.58484404,80 0,76.4202137
-0,71.9999489 L0,8.00005106 Z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:fillType="evenOdd"
-        android:strokeWidth="1"
-        android:pathData="M4,8.00005106 L4,71.9999489 C4,74.2094718 5.79238055,76 8.00697327,76
-L119.993027,76 C122.203379,76 124,74.2058465 124,71.9999489 L124,8.00005106
-C124,5.79052815 122.207619,4 119.993027,4 L8.00697327,4 C5.79662132,4
-4,5.79415354 4,8.00005106 Z" />
-    <group
-            android:translateX="25.000000"
-            android:translateY="8.000000">
-        <path
-            android:fillColor="#000000"
-            android:fillType="evenOdd"
-            android:strokeWidth="1"
-            android:pathData="M14.8523262,61.2026144 L14.8523262,57.2810458 C14.8523262,55.7777778
-13.9471925,54.7973856 12.4601872,54.7973856 C11.6843583,54.7973856
-10.843877,55.0588235 10.2620053,55.9084967 C9.8094385,55.1895425
-9.16291444,54.7973856 8.19312834,54.7973856 C7.54660428,54.7973856
-6.83542781,54.9934641 6.31820856,55.7124183 L6.31820856,54.9281046
-L5.08981283,54.9281046 L5.08981283,61.2026144 L6.31820856,61.2026144
-L6.31820856,57.6078431 C6.31820856,56.496732 6.96473262,55.9738562
-7.86986631,55.9738562 C8.775,55.9738562 9.29221925,56.5620915
-9.29221925,57.6078431 L9.29221925,61.2026144 L10.520615,61.2026144
-L10.520615,57.6078431 C10.520615,56.496732 11.167139,55.9738562
-12.0722727,55.9738562 C12.9774064,55.9738562 13.4946257,56.5620915
-13.4946257,57.6078431 L13.4946257,61.2026144 L14.8523262,61.2026144 Z
-M35.023877,54.9934641 L32.7610428,54.9934641 L32.7610428,53.0980392
-L31.5326471,53.0980392 L31.5326471,54.9934641 L30.2395989,54.9934641
-L30.2395989,56.1045752 L31.5326471,56.1045752 L31.5326471,59.0457516
-C31.5326471,60.4836601 32.0498663,61.3333333 33.6015241,61.3333333
-C34.1833957,61.3333333 34.8299198,61.1372549 35.2824866,60.875817
-L34.8945722,59.7647059 C34.5066578,60.0261438 34.0540909,60.0915033
-33.7308289,60.0915033 C33.0843048,60.0915033 32.7610428,59.6993464
-32.7610428,59.0457516 L32.7610428,56.0392157 L35.023877,56.0392157
-L35.023877,54.9934641 Z M46.5320053,54.7973856 C45.7561765,54.7973856
-45.1743048,55.1895425 44.8510428,55.7124183 L44.8510428,54.9281046
-L43.6226471,54.9281046 L43.6226471,61.2026144 L44.8510428,61.2026144
-L44.8510428,57.6732026 C44.8510428,56.627451 45.368262,55.9738562
-46.2087433,55.9738562 C46.4673529,55.9738562 46.790615,56.0392157
-47.0492246,56.1045752 L47.437139,54.9281046 C47.1785294,54.8627451
-46.790615,54.7973856 46.5320053,54.7973856 L46.5320053,54.7973856 Z
-M29.140508,55.4509804 C28.493984,54.9934641 27.5888503,54.7973856
-26.6190642,54.7973856 C25.0674064,54.7973856 24.0976203,55.5163399
-24.0976203,56.7581699 C24.0976203,57.8039216 24.8087968,58.3921569
-26.1664973,58.5882353 L26.8130214,58.6535948 C27.5241979,58.7843137
-27.9767647,59.0457516 27.9767647,59.372549 C27.9767647,59.8300654
-27.4595455,60.1568627 26.4897594,60.1568627 C25.5199733,60.1568627
-24.8734492,59.8300654 24.4208824,59.503268 L23.7743583,60.4836601
-C24.679492,61.1372549 25.7785829,61.2679739 26.425107,61.2679739
-C28.2353743,61.2679739 29.2051604,60.4183007 29.2051604,59.2418301
-C29.2051604,58.130719 28.4293316,57.6078431 27.071631,57.4117647
-L26.425107,57.3464052 C25.8432353,57.2810458 25.326016,57.0849673
-25.326016,56.6928105 C25.326016,56.2352941 25.8432353,55.9084967
-26.5544118,55.9084967 C27.3302406,55.9084967 28.1060695,56.2352941
-28.493984,56.4313725 L29.140508,55.4509804 Z M47.8897059,58.0653595
-C47.8897059,59.9607843 49.1181016,61.3333333 51.1223262,61.3333333
-C52.0274599,61.3333333 52.673984,61.1372549 53.320508,60.6143791
-L52.673984,59.6339869 C52.1567647,60.0261438 51.6395455,60.2222222
-51.0576738,60.2222222 C49.9585829,60.2222222 49.1181016,59.372549
-49.1181016,58.130719 C49.1181016,56.8888889 49.9585829,56.0392157
-51.0576738,56.0392157 C51.6395455,56.0392157 52.1567647,56.2352941
-52.673984,56.627451 L53.320508,55.6470588 C52.673984,55.124183
-52.0274599,54.9281046 51.1223262,54.9281046 C49.182754,54.7973856
-47.8897059,56.1699346 47.8897059,58.0653595 L47.8897059,58.0653595 Z
-M39.2262834,54.7973856 C37.416016,54.7973856 36.1876203,56.1045752
-36.1876203,58.0653595 C36.1876203,60.0261438 37.4806684,61.3333333
-39.3555882,61.3333333 C40.2607219,61.3333333 41.1658556,61.0718954
-41.8770321,60.4836601 L41.230508,59.5686275 C40.7132888,59.9607843
-40.0667647,60.2222222 39.4202406,60.2222222 C38.5797594,60.2222222
-37.6746257,59.6993464 37.5453209,58.5882353 L42.1356417,58.5882353
-L42.1356417,58.0653595 C42.1356417,56.1045752 40.9718984,54.7973856
-39.2262834,54.7973856 L39.2262834,54.7973856 Z M39.161631,55.9738562
-C40.0667647,55.9738562 40.7132888,56.5620915 40.7779412,57.5424837
-L37.416016,57.5424837 C37.6099733,56.627451 38.1918449,55.9738562
-39.161631,55.9738562 L39.161631,55.9738562 Z M22.4166578,58.0653595
-L22.4166578,54.9281046 L21.188262,54.9281046 L21.188262,55.7124183
-C20.7356952,55.124183 20.0891711,54.7973856 19.1840374,54.7973856
-C17.4384225,54.7973856 16.1453743,56.1699346 16.1453743,58.0653595
-C16.1453743,59.9607843 17.4384225,61.3333333 19.1840374,61.3333333
-C20.0891711,61.3333333 20.7356952,61.0065359 21.188262,60.4183007
-L21.188262,61.2026144 L22.4166578,61.2026144 L22.4166578,58.0653595 Z
-M17.4384225,58.0653595 C17.4384225,56.8888889 18.1495989,55.9738562
-19.3779947,55.9738562 C20.541738,55.9738562 21.2529144,56.8888889
-21.2529144,58.0653595 C21.2529144,59.3071895 20.4770856,60.1568627
-19.3779947,60.1568627 C18.1495989,60.2222222 17.4384225,59.2418301
-17.4384225,58.0653595 L17.4384225,58.0653595 Z M65.2165508,54.7973856
-C64.4407219,54.7973856 63.8588503,55.1895425 63.5355882,55.7124183
-L63.5355882,54.9281046 L62.3071925,54.9281046 L62.3071925,61.2026144
-L63.5355882,61.2026144 L63.5355882,57.6732026 C63.5355882,56.627451
-64.0528075,55.9738562 64.8932888,55.9738562 C65.1518984,55.9738562
-65.4751604,56.0392157 65.7337701,56.1045752 L66.1216845,54.9281046
-C65.8630749,54.8627451 65.4751604,54.7973856 65.2165508,54.7973856
-L65.2165508,54.7973856 Z M60.4322727,58.0653595 L60.4322727,54.9281046
-L59.203877,54.9281046 L59.203877,55.7124183 C58.7513102,55.124183
-58.1047861,54.7973856 57.1996524,54.7973856 C55.4540374,54.7973856
-54.1609893,56.1699346 54.1609893,58.0653595 C54.1609893,59.9607843
-55.4540374,61.3333333 57.1996524,61.3333333 C58.1047861,61.3333333
-58.7513102,61.0065359 59.203877,60.4183007 L59.203877,61.2026144
-L60.4322727,61.2026144 L60.4322727,58.0653595 Z M55.4540374,58.0653595
-C55.4540374,56.8888889 56.1652139,55.9738562 57.3936096,55.9738562
-C58.5573529,55.9738562 59.2685294,56.8888889 59.2685294,58.0653595
-C59.2685294,59.3071895 58.4927005,60.1568627 57.3936096,60.1568627
-C56.1652139,60.2222222 55.4540374,59.2418301 55.4540374,58.0653595
-L55.4540374,58.0653595 Z M72.9101872,58.0653595 L72.9101872,52.4444444
-L71.6817914,52.4444444 L71.6817914,55.7124183 C71.2292246,55.124183
-70.5827005,54.7973856 69.6775668,54.7973856 C67.9319519,54.7973856
-66.6389037,56.1699346 66.6389037,58.0653595 C66.6389037,59.9607843
-67.9319519,61.3333333 69.6775668,61.3333333 C70.5827005,61.3333333
-71.2292246,61.0065359 71.6817914,60.4183007 L71.6817914,61.2026144
-L72.9101872,61.2026144 L72.9101872,58.0653595 Z M67.9319519,58.0653595
-C67.9319519,56.8888889 68.6431283,55.9738562 69.8715241,55.9738562
-C71.0352674,55.9738562 71.7464439,56.8888889 71.7464439,58.0653595
-C71.7464439,59.3071895 70.970615,60.1568627 69.8715241,60.1568627
-C68.6431283,60.2222222 67.9319519,59.2418301 67.9319519,58.0653595 Z" />
-        <group
-                android:translateY="1.711934">
-            <path
-                android:fillColor="#FF5F00"
-                android:fillType="evenOdd"
-                android:strokeWidth="1"
-                android:pathData="M 26.9600535 5.20164609 H 49.3944385 V 42.46913579 H 26.9600535 V 5.20164609 Z" />
-            <path
-                android:fillColor="#EB001B"
-                android:fillType="evenOdd"
-                android:strokeWidth="1"
-                android:pathData="M29.2228877,23.8353909 C29.2228877,16.2633745 32.7141176,9.5473251
-38.0802674,5.20164609 C34.1364706,2.04115226 29.1582353,0.131687243
-23.7274332,0.131687243 C10.8616043,0.131687243 0.452566845,10.7325103
-0.452566845,23.8353909 C0.452566845,36.9382716 10.8616043,47.5390947
-23.7274332,47.5390947 C29.1582353,47.5390947 34.1364706,45.6296296
-38.0802674,42.4691358 C32.7141176,38.1234568 29.2228877,31.4074074
-29.2228877,23.8353909 Z" />
-            <path
-                android:fillColor="#F79E1B"
-                android:fillType="evenOdd"
-                android:strokeWidth="1"
-                android:pathData="M75.7726203,23.8353909 C75.7726203,36.9382716 65.3635829,47.5390947
-52.497754,47.5390947 C47.0669519,47.5390947 42.0887166,45.6296296
-38.1449198,42.4691358 C43.5757219,38.1234568 47.0022995,31.4074074
-47.0022995,23.8353909 C47.0022995,16.2633745 43.5110695,9.5473251
-38.1449198,5.20164609 C42.0887166,2.04115226 47.0669519,0.131687243
-52.497754,0.131687243 C65.3635829,0.131687243 75.7726203,10.7325103
-75.7726203,23.8353909 Z" />
-        </group>
-    </group>
-</vector>

chrome/android/java/res/drawable/mir_card.xml

 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2017 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. -->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-   xmlns:tools="http://schemas.android.com/tools"
-   tools:targetApi="21"
-   android:width="32dp"
-   android:height="20dp"
-   android:viewportWidth="128"
-   android:viewportHeight="80">
-
-    <path
-        android:fillColor="#E0E0E0"
-        android:fillType="evenOdd"
-        android:strokeWidth="1"
-        android:pathData="M0,8.00005106 C0,3.58174486 3.59075293,0 8.00697327,0 L119.993027,0
-C124.415156,0 128,3.5797863 128,8.00005106 L128,71.9999489 C128,76.4182551
-124.409247,80 119.993027,80 L8.00697327,80 C3.58484404,80 0,76.4202137
-0,71.9999489 L0,8.00005106 Z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:fillType="evenOdd"
-        android:strokeWidth="1"
-        android:pathData="M4,8.00005106 L4,71.9999489 C4,74.2094718 5.79238055,76 8.00697327,76
-L119.993027,76 C122.203379,76 124,74.2058465 124,71.9999489 L124,8.00005106
-C124,5.79052815 122.207619,4 119.993027,4 L8.00697327,4 C5.79662132,4
-4,5.79415354 4,8.00005106 Z" />
-    <path android:fillColor="#3BA536"
-        android:pathData="M34.86,29.77L31.05,42.52C30.95,42.86 30.44,42.86 30.34,42.52L26.53,29.77C25.87,27.54 23.74,26 21.31,26L21.31,26L12,26L12,54L21.31,54L21.31,37.62C21.31,37.22 21.9,37.13 22.03,37.51L27.47,54L33.92,54L39.36,37.51C39.48,37.13 40.08,37.22 40.08,37.62L40.08,54L49.39,54L49.39,26L40.08,26L40.08,26C37.65,26 35.52,27.54 34.86,29.77"
-        android:strokeColor="#00000000" android:strokeWidth="1"/>
-    <path android:fillColor="#3BA536"
-        android:pathData="M74.71,26C72.62,26 70.72,27.17 69.84,28.99L63.44,42.25C63.28,42.59 62.74,42.48 62.74,42.1L62.74,26L53.43,26L53.43,54L61.31,54L61.31,54C63.38,54 65.25,52.83 66.09,51.01L72.58,36.87C72.74,36.52 73.28,36.63 73.28,37.01L73.28,54L73.28,54L73.28,54L82.59,54L82.59,26L74.71,26Z"
-        android:strokeColor="#00000000" android:strokeWidth="1"/>
-    <path android:fillColor="#3BA536"
-        android:pathData="M86.63,38.9L86.63,54L95.94,54L95.94,45.06L105.85,45.06C110.1,45.06 113.73,42.5 115.15,38.9L86.63,38.9Z"
-        android:strokeColor="#00000000" android:strokeWidth="1"/>
-    <path android:fillColor="#0093D3"
-        android:pathData="M105.85,26L85.42,26C86.14,32.48 91.86,37.53 98.81,37.53L115.57,37.53C115.72,36.88 115.8,36.21 115.8,35.53L115.8,35.53C115.8,30.27 111.34,26 105.85,26"
-        android:strokeColor="#00000000" android:strokeWidth="1"/>
+<!--Copyright 2019 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.-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" xmlns:aapt="http://schemas.android.com/aapt" tools:targetApi="21" android:width="32dp" android:height="20dp" android:viewportWidth="32" android:viewportHeight="20">
+    <path android:pathData="M8.714 7.443C8.88 6.885 9.414 6.5 10.019 6.5h2.328v7H10.02V9.405c0-0.1-0.148-0.122-0.18-0.026L8.48 13.5H6.868l-1.36-4.121c-0.032-0.096-0.18-0.075-0.18 0.026V13.5H3v-7h2.328c0.606 0 1.138 0.385 1.305 0.943l0.952 3.187c0.025 0.085 0.152 0.085 0.177 0l0.952-3.187zM18.678 6.5h1.97v7H18.32V9.254c0-0.096-0.136-0.123-0.176-0.036l-1.622 3.535c-0.208 0.454-0.677 0.747-1.195 0.747h-1.97v-7h2.328v4.025c0 0.095 0.135 0.123 0.176 0.037l1.6-3.315C17.68 6.79 18.154 6.5 18.677 6.5zm2.98 3.226h7.13c-0.355 0.899-1.262 1.538-2.325 1.538h-2.477V13.5h-2.328V9.726z" android:strokeWidth="1" android:fillColor="#3BA536" android:fillType="evenOdd"/>
+    <path android:pathData="M26.463 6.5h-5.108c0.18 1.62 1.61 2.882 3.347 2.882h4.192c0.036-0.161 0.055-0.328 0.055-0.5 0-1.316-1.113-2.382-2.486-2.382" android:strokeWidth="1" android:fillType="evenOdd">
+        <aapt:attr name="android:fillColor">
+            <gradient android:startY="6.8339853" android:startX="21.3552" android:endY="6.8339853" android:endX="28.9491" android:type="linear">
+                <item android:offset="0" android:color="#FF00A5D8"/>
+                <item android:offset="1" android:color="#FF007DC0"/>
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path android:pathData="M8.714 7.443C8.88 6.885 9.414 6.5 10.019 6.5h2.328v7H10.02V9.405c0-0.1-0.148-0.122-0.18-0.026L8.48 13.5H6.868l-1.36-4.121c-0.032-0.096-0.18-0.075-0.18 0.026V13.5H3v-7h2.328c0.606 0 1.138 0.385 1.305 0.943l0.952 3.187c0.025 0.085 0.152 0.085 0.177 0l0.952-3.187zM18.678 6.5h1.97v7H18.32V9.254c0-0.096-0.136-0.123-0.176-0.036l-1.622 3.535c-0.208 0.454-0.677 0.747-1.195 0.747h-1.97v-7h2.328v4.025c0 0.095 0.135 0.123 0.176 0.037l1.6-3.315C17.68 6.79 18.154 6.5 18.677 6.5zm2.98 3.226h7.13c-0.355 0.899-1.262 1.538-2.325 1.538h-2.477V13.5h-2.328V9.726z" android:strokeWidth="1" android:fillColor="#3BA536" android:fillType="evenOdd"/>
+    <path android:pathData="M26.463 6.5h-5.108c0.18 1.62 1.61 2.882 3.347 2.882h4.192c0.036-0.161 0.055-0.328 0.055-0.5 0-1.316-1.113-2.382-2.486-2.382" android:strokeWidth="1" android:fillType="evenOdd">
+        <aapt:attr name="android:fillColor">
+            <gradient android:startY="6.8339853" android:startX="21.3552" android:endY="6.8339853" android:endX="28.9491" android:type="linear">
+                <item android:offset="0" android:color="#FF00A5D8"/>
+                <item android:offset="1" android:color="#FF007DC0"/>
+            </gradient>
+        </aapt:attr>
+    </path>
 </vector>
-

chrome/android/java/res/drawable/visa_card.xml

 <?xml version="1.0" encoding="utf-8"?>
-<!-- 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. -->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:targetApi="21"
-    android:width="32dp"
-    android:height="20dp"
-    android:viewportWidth="128"
-    android:viewportHeight="80">
-
-    <path
-        android:fillColor="#E0E0E0"
-        android:fillType="evenOdd"
-        android:strokeWidth="1"
-        android:pathData="M0,8.00005106 C0,3.58174486 3.59075293,0 8.00697327,0 L119.993027,0
-C124.415156,0 128,3.5797863 128,8.00005106 L128,71.9999489 C128,76.4182551
-124.409247,80 119.993027,80 L8.00697327,80 C3.58484404,80 0,76.4202137
-0,71.9999489 L0,8.00005106 Z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:fillType="evenOdd"
-        android:strokeWidth="1"
-        android:pathData="M4,8.00005106 L4,71.9999489 C4,74.2094718 5.79238055,76 8.00697327,76
-L119.993027,76 C122.203379,76 124,74.2058465 124,71.9999489 L124,8.00005106
-C124,5.79052815 122.207619,4 119.993027,4 L8.00697327,4 C5.79662132,4
-4,5.79415354 4,8.00005106 Z" />
-    <path
-        android:fillColor="#10347E"
-        android:fillType="evenOdd"
-        android:strokeWidth="1"
-        android:pathData="M63.4919867,23.9958263 L56.5451423,55.9982383 L48.1449266,55.9982383
-L55.0891047,23.9958263 L63.4919867,23.9958263 L63.4919867,23.9958263 Z
-M98.8502272,44.6626274 L103.274341,32.6413637 L105.821072,44.6626274
-L98.8502272,44.6626274 L98.8502272,44.6626274 Z M108.226468,55.9982383
-L116,55.9982383 L109.22116,23.9958263 L102.044975,23.9958263
-C100.431601,23.9958263 99.0635658,24.9179119 98.4662171,26.3443861
-L85.8578939,55.9982383 L94.6794533,55.9982383 L96.4368319,51.2249349
-L107.215775,51.2249349 L108.226468,55.9982383 L108.226468,55.9982383 Z
-M86.2979051,45.5505618 C86.3299059,37.0994243 74.4389341,36.6370679
-74.5216032,32.8672878 C74.545604,31.7113971 75.6602987,30.4950848
-78.084361,30.1824689 C79.2870586,30.0301014 82.6044768,29.9066313
-86.3725736,31.6141972 L87.8446114,24.8312201 C85.8232263,24.1035343
-83.2204931,23.4099998 79.9884098,23.4099998 C71.684197,23.4099998
-65.8333803,27.7603523 65.7827125,33.9969084 C65.7293779,38.5942012
-69.9534859,41.1634311 73.142901,42.6976134 C76.4149851,44.2685737
-77.5110129,45.2773515 77.500346,46.6749285 C77.481679,48.8238344
-74.8896127,49.7669359 72.4788843,49.8037145 C68.2521088,49.874644
-65.7987127,48.684602 63.8386623,47.7887867 L62.3212904,54.7950611
-C64.2813403,55.6882494 67.9027669,56.4579671 71.6681968,56.5 C80.492423,56.5
-86.2632374,52.204815 86.2979051,45.5505618 L86.2979051,45.5505618
-L86.2979051,45.5505618 Z M37.8779971,55.9982383 L28.9924357,55.9982383
-L22.2909305,30.4556794 C21.8829201,28.8847188 21.5255776,28.3094004
-20.2908793,27.6473903 C18.2694941,26.5650562 14.9334085,25.5510248 12,24.9179119
-L12.1973384,23.9958263 L26.4990384,23.9958263 C28.325752,23.9958263
-29.9604605,25.1858684 30.3764712,27.2585907 L33.9125618,45.776486
-L42.6594526,23.9958263 L51.4890125,23.9958263 L37.8779971,55.9982383 Z" />
+<!--Copyright 2019 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.-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" tools:targetApi="21" android:width="32dp" android:height="20dp" android:viewportWidth="32" android:viewportHeight="20">
+    <path android:pathData="M15.873 5.996l-1.737 7.999h-2.1l1.736-7.999h2.101zm8.84 5.166l1.106-3.005 0.636 3.005h-1.742zm2.344 2.833H29l-1.695-7.999h-1.794c-0.403 0-0.745 0.23-0.894 0.587l-3.152 7.412h2.205l0.44-1.193h2.694l0.253 1.193zm-5.482-2.611c0.008-2.113-2.965-2.228-2.945-3.17 0.006-0.29 0.285-0.593 0.891-0.671 0.3-0.038 1.13-0.07 2.072 0.357l0.368-1.695c-0.505-0.182-1.156-0.355-1.964-0.355-2.076 0-3.539 1.087-3.551 2.646-0.014 1.149 1.042 1.791 1.84 2.174 0.818 0.393 1.092 0.645 1.09 0.995-0.006 0.537-0.654 0.772-1.256 0.781-1.057 0.018-1.67-0.28-2.16-0.503l-0.38 1.75c0.49 0.224 1.396 0.417 2.337 0.427 2.206 0 3.649-1.073 3.657-2.736zM9.47 13.993H7.248L5.573 7.612C5.47 7.218 5.38 7.074 5.073 6.909 4.567 6.639 3.733 6.385 3 6.227l0.05-0.23h3.575c0.456 0 0.865 0.297 0.97 0.815l0.883 4.628 2.187-5.444h2.207L9.47 13.995z" android:strokeWidth="1" android:fillColor="#10347E" android:fillType="evenOdd"/>
+    <path android:pathData="M15.873 5.996l-1.737 7.999h-2.1l1.736-7.999h2.101zm8.84 5.166l1.106-3.005 0.636 3.005h-1.742zm2.344 2.833H29l-1.695-7.999h-1.794c-0.403 0-0.745 0.23-0.894 0.587l-3.152 7.412h2.205l0.44-1.193h2.694l0.253 1.193zm-5.482-2.611c0.008-2.113-2.965-2.228-2.945-3.17 0.006-0.29 0.285-0.593 0.891-0.671 0.3-0.038 1.13-0.07 2.072 0.357l0.368-1.695c-0.505-0.182-1.156-0.355-1.964-0.355-2.076 0-3.539 1.087-3.551 2.646-0.014 1.149 1.042 1.791 1.84 2.174 0.818 0.393 1.092 0.645 1.09 0.995-0.006 0.537-0.654 0.772-1.256 0.781-1.057 0.018-1.67-0.28-2.16-0.503l-0.38 1.75c0.49 0.224 1.396 0.417 2.337 0.427 2.206 0 3.649-1.073 3.657-2.736zM9.47 13.993H7.248L5.573 7.612C5.47 7.218 5.38 7.074 5.073 6.909 4.567 6.639 3.733 6.385 3 6.227l0.05-0.23h3.575c0.456 0 0.865 0.297 0.97 0.815l0.883 4.628 2.187-5.444h2.207L9.47 13.995z" android:strokeWidth="1" android:fillColor="#10347E" android:fillType="evenOdd"/>
 </vector>

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

@@ -63,7 +63,7 @@ public class PaymentRequestBillingAddressTest implements MainActivityStartCallba
                 "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.visa_card,
+                "4111111111111111", "1111", "12", "2050", "amex", R.drawable.amex_card,
                 CardType.UNKNOWN, profile1, "" /* serverId */));
         String profile2 = helper.setProfile(new AutofillProfile("", "https://example.com", true,
                 "Rob Doe", "Google", "340 Main St", "CA", "Los Angeles", "", "90291", "", "US",
@@ -98,7 +98,7 @@ public class PaymentRequestBillingAddressTest implements MainActivityStartCallba
 
         // 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.visa_card,
+                "4242424242424242", "1111", "12", "2050", "amex", R.drawable.amex_card,
                 CardType.UNKNOWN, profile6, "" /* serverId */));
 
         // Assign use stats so that incomplete profiles have the highest frecency, profile2 has the

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

@@ -61,7 +61,7 @@ public class PaymentRequestBillingAddressWithoutPhoneTest implements MainActivit
                 "https://example.com", true, "Jon NoPhone", "Google", "340 Main St", "CA",
                 "Los Angeles", "", "90291", "", "US", "", "jon.doe@gmail.com", "en-US"));
         helper.setCreditCard(new CreditCard("", "https://example.com", true, true, "Jon Doe",
-                "4111111111111111", "1111", "12", "2050", "visa", R.drawable.visa_card,
+                "4111111111111111", "1111", "12", "2050", "amex", R.drawable.amex_card,
                 CardType.UNKNOWN, address_without_phone, "" /* serverId */));
         String address_with_phone = helper.setProfile(new AutofillProfile("", "https://example.com",
                 true, "Rob Phone", "Google", "340 Main St", "CA", "Los Angeles", "", "90291", "",

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

@@ -54,7 +54,7 @@ public class PaymentRequestCardEditorAutoAdvanceTest implements MainActivityStar
                 true, "Jon Doe", "Google", "340 Main St", "CA", "Los Angeles", "", "90291", "",
                 "US", "555-555-5555", "", "en-US"));
         helper.setCreditCard(new CreditCard("", "https://example.com", true, true, "Jon Doe",
-                "4111111111111111", "1111", "1", "2050", "visa", R.drawable.visa_card,
+                "4111111111111111", "1111", "1", "2050", "amex", R.drawable.amex_card,
                 CardType.UNKNOWN, billingAddressId, "" /* serverId */));
     }
 

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

@@ -52,7 +52,7 @@ public class PaymentRequestDebitTest implements MainActivityStartCallback {
 
         // Should be pre-selected:
         helper.addServerCreditCard(new CreditCard("", "https://example.com", false, true, "Jon Doe",
-                "4111111111111111", "1111", "12", "2050", "visa", R.drawable.visa_card,
+                "4111111111111111", "1111", "12", "2050", "amex", R.drawable.amex_card,
                 CardType.DEBIT, billingAddressId, "server-id-1"));
 
         // Should be available, but never pre-selected:
@@ -62,7 +62,7 @@ public class PaymentRequestDebitTest implements MainActivityStartCallback {
 
         // Should not be available:
         helper.addServerCreditCard(new CreditCard("", "https://example.com", false, true, "Jon Doe",
-                "378282246310005", "0005", "12", "2050", "amex", R.drawable.amex_card,
+                "378282246310005", "0005", "12", "2050", "jcb", R.drawable.jcb_card,
                 CardType.CREDIT, billingAddressId, "server-id-3"));
         helper.addServerCreditCard(new CreditCard("", "https://example.com", false, true, "Jon Doe",
                 "5555555555554444", "4444", "12", "2050", "mastercard", R.drawable.mc_card,

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

@@ -54,7 +54,7 @@ public class PaymentRequestDontHaveDebitTest implements MainActivityStartCallbac
 
         // Should be available, but never pre-selected:
         helper.addServerCreditCard(new CreditCard("", "https://example.com", false, true, "Jon Doe",
-                "6011111111111117", "1117", "12", "2050", "discover", R.drawable.discover_card,
+                "6011111111111117", "1117", "12", "2050", "diners", R.drawable.diners_card,
                 CardType.UNKNOWN, billingAddressId, "server-id-2"));
 
         // Should not be available:
@@ -62,7 +62,7 @@ public class PaymentRequestDontHaveDebitTest implements MainActivityStartCallbac
                 "378282246310005", "0005", "12", "2050", "amex", R.drawable.amex_card,
                 CardType.CREDIT, billingAddressId, "server-id-3"));
         helper.addServerCreditCard(new CreditCard("", "https://example.com", false, true, "Jon Doe",
-                "5555555555554444", "4444", "12", "2050", "mastercard", R.drawable.mc_card,
+                "5555555555554444", "4444", "12", "2050", "jcb", R.drawable.jcb_card,
                 CardType.PREPAID, billingAddressId, "server-id-4"));
     }
 

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

@@ -56,7 +56,7 @@ public class PaymentRequestExpiredLocalCardTest implements MainActivityStartCall
                 "US", "555-555-5555", "", "en-US"));
         // Create an expired credit card
         mCreditCardId = mHelper.setCreditCard(new CreditCard("", "https://example.com", true, true,
-                "Jon Doe", "4111111111111111", "1111", "1", "2016", "visa", R.drawable.visa_card,
+                "Jon Doe", "4111111111111111", "1111", "1", "2016", "amex", R.drawable.amex_card,
                 CardType.UNKNOWN, billingAddressId, "" /* serverId */));
     }
 

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

@@ -85,7 +85,7 @@ public class PaymentRequestFreeShippingTest implements MainActivityStartCallback
                 true, "Jon Doe", "Google", "340 Main St", "CA", "Los Angeles", "", "90291", "",
                 "US", "650-253-0000", "", "en-US"));
         helper.setCreditCard(new CreditCard("", "https://example.com", true, true, "Jon Doe",
-                "4111111111111111", "1111", "12", "2050", "visa", R.drawable.visa_card,
+                "4111111111111111", "1111", "12", "2050", "amex", R.drawable.amex_card,
                 CardType.UNKNOWN, billingAddressId, "" /* serverId */));
     }
 

components/test/data/payments/render_tests/PaymentRequestFreeShippingTest.NightModeDisabled-free_shipping.Nexus_5-19.png.sha1

-f3da9bd72be06e533c6f516f0af3f6b2b3a149ae
+8b000d03734707f79de4b325bb4c934267fb4766
\ No newline at end of file

components/test/data/payments/render_tests/PaymentRequestFreeShippingTest.NightModeEnabled-free_shipping.Nexus_5-19.png.sha1

-e274c8ea0773890604772fe16c57c29e157e52c5
+e1438bd6c2f22115f6eefdde1aa5f9d2f88cc1d9
\ No newline at end of file