[Payment Request] Mark some tests as flaky, and attempt fixes

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

Index: chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestDynamicShippingSingleAddressTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestDynamicShippingSingleAddressTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestDynamicShippingSingleAddressTest.java
index cee30007611ccf1d24be902029fe80fd55b0c7f2..8c487d485c2b68ceae7a6000cd8daf3c3e22bd75 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestDynamicShippingSingleAddressTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestDynamicShippingSingleAddressTest.java
@@ -68,7 +68,7 @@ public class PaymentRequestDynamicShippingSingleAddressTest extends PaymentReque
     }
 
     /** Attempt to add an invalid address and cancel the transaction. */
-    @FlakyTest(message = "crbug.com/673136")
+    @FlakyTest(message = "crbug.com/673371")
     @Feature({"Payments"})
     public void testAddInvalidAddressAndCancel()
             throws InterruptedException, ExecutionException, TimeoutException {
@@ -76,7 +76,7 @@ public class PaymentRequestDynamicShippingSingleAddressTest extends PaymentReque
         clickInShippingSummaryAndWait(R.id.payments_section, mReadyForInput);
         clickInShippingAddressAndWait(R.id.payments_add_option_button, mReadyToEdit);
         clickInEditorAndWait(R.id.payments_edit_done_button, mEditorValidationError);
-        clickInEditorAndWait(R.id.payments_edit_cancel_button, mReadyForInput);
+        clickInEditorAndWait(R.id.payments_edit_cancel_button, mReadyToPay);
         clickAndWait(R.id.close_button, mDismissed);
         expectResultContains(new String[] {"Request cancelled"});
     }
@@ -105,6 +105,7 @@ public class PaymentRequestDynamicShippingSingleAddressTest extends PaymentReque
 
     /** Quickly pressing "add address" and then [X] should not crash. */
     @MediumTest
+    @FlakyTest(message = "crbug.com/673371")
     @Feature({"Payments"})
     public void testQuickAddAddressAndCloseShouldNotCrash()
             throws InterruptedException, ExecutionException, TimeoutException {
@@ -153,6 +154,7 @@ public class PaymentRequestDynamicShippingSingleAddressTest extends PaymentReque
 
     /** Quickly pressing "add address" and then "cancel" should not crash. */
     @MediumTest
+    @FlakyTest(message = "crbug.com/673371")
     @Feature({"Payments"})
     public void testQuickAddAddressAndCancelShouldNotCrash()
             throws InterruptedException, ExecutionException, TimeoutException {