separate shipping address and option on bottom sheet

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

Index: chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestShippingAddressAndOptionTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestShippingAddressAndOptionTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestShippingAddressAndOptionTest.java
index 299b6fc3107599d1b75fe08423793ddfe7dff270..490fbd096143daec88bc8220e242426e435a6d1a 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestShippingAddressAndOptionTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestShippingAddressAndOptionTest.java
@@ -74,8 +74,11 @@ public class PaymentRequestShippingAddressAndOptionTest implements MainActivityS
 
         // Make sure shipping option summary on bottom sheet is displayed in a single line
         // as expected.
-        Assert.assertEquals("Free global shipping, $0.00",
-                mPaymentRequestTestRule.getShippingOptionSummaryLabel());
+        Assert.assertEquals(
+                "Free global shipping", mPaymentRequestTestRule.getShippingOptionSummaryLabel());
+
+        // Make sure shipping cost is display in the summary right text view.
+        Assert.assertEquals("$0.00", mPaymentRequestTestRule.getShippingOptionCostSummaryLabel());
     }
 
     /** Verifies that the shipping address format in fullsheet mode is as expected. */
@@ -157,8 +160,8 @@ public class PaymentRequestShippingAddressAndOptionTest implements MainActivityS
         Assert.assertTrue(mPaymentRequestTestRule.getShippingAddressOptionRowAtIndex(0)
                                   .getLabelText()
                                   .toString()
-                                  .equals("Seb Doe\nGoogle, 340 Main St, Los Angeles, CA 90291\n"
-                                          + "+1 650-253-0000"));
+                                  .equals("Seb Doe\nGoogle, 340 Main St, Los Angeles, CA 90291"
+                                          + " \n+1 650-253-0000"));
     }
 
     /**