[Payments] Display the shipping option error alongside the address

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

Index: chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestDynamicShippingMultipleAddressesTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestDynamicShippingMultipleAddressesTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestDynamicShippingMultipleAddressesTest.java
index db9950d33b99b47ebfc436d34be88e8e89d4c060..5214517ba92509cc1b602e13aa77d1b8fd79cc24 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestDynamicShippingMultipleAddressesTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestDynamicShippingMultipleAddressesTest.java
@@ -178,11 +178,9 @@ public class PaymentRequestDynamicShippingMultipleAddressesTest extends PaymentR
                 AUTOFILL_PROFILES[3].getFullName()));
         clickOnShippingAddressSuggestionOptionAndWait(0, mSelectionChecked);
 
-        // The string should indicate that the shipping address isn't valid.
+        // The string should reflect the error sent from the merchant.
         CharSequence actualString = getShippingAddressOptionRowAtIndex(0).getLabelText();
-        CharSequence expectedString = getInstrumentation().getTargetContext().getString(
-                R.string.payments_unsupported_shipping_address);
-        assertEquals(expectedString, actualString);
+        assertEquals("We do not ship to this address", actualString);
     }
 
     /**