Fix GooglePay icon for desktop.

Define different google pay icon for non Android.
Fixing a bug introduced in https://chromium-review.googlesource.com/c/chromium/src/+/1560317

Bug: 949743
Change-Id: Ie573dde5129c2c6f1f89569b708a118545342058
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1585383Reviewed-by: Jared Saul <jsaul@google.com>
Reviewed-by: Jochen Eisinger <jochen@chromium.org>
Commit-Queue: Siddharth Shah <siashah@chromium.org>
Cr-Commit-Position: refs/heads/master@{#654744}

chrome/browser/ui/autofill/autofill_popup_layout_model.cc

@@ -71,16 +71,17 @@ const struct {
     {autofill::kMirCard, IDR_AUTOFILL_CC_MIR, IDS_AUTOFILL_CC_MIR},
     {autofill::kUnionPay, IDR_AUTOFILL_CC_UNIONPAY, IDS_AUTOFILL_CC_UNION_PAY},
     {autofill::kVisaCard, IDR_AUTOFILL_CC_VISA, IDS_AUTOFILL_CC_VISA},
-#if defined(GOOGLE_CHROME_BUILD)
-    {"googlePay", IDR_ANDROID_AUTOFILL_GOOGLE_PAY, kResourceNotFoundId},
-#endif  // GOOGLE_CHROME_BUILD
 #if defined(OS_ANDROID)
     {"httpWarning", IDR_AUTOFILL_HTTP_WARNING, kResourceNotFoundId},
     {"httpsInvalid", IDR_AUTOFILL_HTTPS_INVALID_WARNING, kResourceNotFoundId},
     {"scanCreditCardIcon", IDR_AUTOFILL_CC_SCAN_NEW, kResourceNotFoundId},
     {"settings", IDR_AUTOFILL_SETTINGS, kResourceNotFoundId},
     {"create", IDR_AUTOFILL_CREATE, kResourceNotFoundId},
+#if defined(GOOGLE_CHROME_BUILD)
+    {"googlePay", IDR_ANDROID_AUTOFILL_GOOGLE_PAY, kResourceNotFoundId},
+#endif  // GOOGLE_CHROME_BUILD
 #elif defined(GOOGLE_CHROME_BUILD)
+    {"googlePay", IDR_AUTOFILL_GOOGLE_PAY, kResourceNotFoundId},
     {"googlePayDark", IDR_AUTOFILL_GOOGLE_PAY_DARK, kResourceNotFoundId},
 #endif  // GOOGLE_CHROME_BUILD
 };